Skip to content

Commit

Permalink
xorg-server: fixup build after #29039
Browse files Browse the repository at this point in the history 
The expression uncarefully overrode whole nativeBuildInputs,
so after the pkgconfig move it got removed and the build failed.
1.19.3 doesn't need these lines anyway...
  • Loading branch information
@vcunat
vcunat committed Oct 7, 2017
1 parent 0be2928 commit 35b4c8b
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions pkgs/servers/x11/xorg/overrides.nix
View file
Expand Up @@ -398,11 +398,6 @@ in
let
attrs = with args;
if (args.abiCompat == null) then attrs_passed
# All this just for 1.19.2, as the tarball is incorrectly autotoolized.
// {
nativeBuildInputs = [ utilmacros fontutil ];
preConfigure = "libtoolize --force; aclocal; autoheader; automake -afi";
}
else if (args.abiCompat == "1.17") then {
name = "xorg-server-1.17.4";
builder = ./builder.sh;
Expand Down

3 comments on commit 35b4c8b

@NeQuissimus
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcunat

This seems to break x86-video-intel:

master @ 134c1a6 is fine

    (*screen->BlockHandler) (BLOCKHANDLER_ARGS);
     ~^~~~~~~~~~~~~~~~~~~~~~
i810_video.c:1151:26: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types]
     screen->BlockHandler = I810BlockHandler;
                          ^
i810_video.c: In function 'I810DisplaySurface':
i810_video.c:1376:36: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types]
       pScrn->pScreen->BlockHandler = I810BlockHandler;
                                    ^
make[5]: *** [Makefile:513: i810_video.lo] Error 1
make[5]: Leaving directory '/tmp/nix-build-xf86-video-intel-2.99.917.drv-0/xf86-video-intel-2.99.917/src/legacy/i810'
make[4]: *** [Makefile:528: all-recursive] Error 1
make[4]: Leaving directory '/tmp/nix-build-xf86-video-intel-2.99.917.drv-0/xf86-video-intel-2.99.917/src/legacy/i810'
make[3]: *** [Makefile:472: all-recursive] Error 1
make[3]: Leaving directory '/tmp/nix-build-xf86-video-intel-2.99.917.drv-0/xf86-video-intel-2.99.917/src/legacy'
make[2]: *** [Makefile:608: all-recursive] Error 1
make[2]: Leaving directory '/tmp/nix-build-xf86-video-intel-2.99.917.drv-0/xf86-video-intel-2.99.917/src'
make[1]: *** [Makefile:478: all-recursive] Error 1
make[1]: Leaving directory '/tmp/nix-build-xf86-video-intel-2.99.917.drv-0/xf86-video-intel-2.99.917'
make: *** [Makefile:410: all] Error 2
builder for ‘/nix/store/2490pky9qddf7wslrhb6sj0y8lfwbxis-xf86-video-intel-2.99.917.drv’ failed with exit code 2
cannot build derivation ‘/nix/store/cw1434s4lb3brjjpxvn5b537qcsyzlaa-xserver.conf.drv’: 1 dependencies couldn't be built

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 35b4c8b Oct 7, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed the problem. I'll get to it this weekend, I believe, but feel free to start. There's also a security update for X, firefox, etc...

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 35b4c8b Oct 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was broken earlier; fixed since 35f8948.

Please sign in to comment.