public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg-server: fixup build after #29039

Browse Source 
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...
This commit is contained in:
Vladimír Čunát 2017-10-07 09:38:42 +02:00
parent 0be2928ac9
commit 35b4c8be51
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/x11/xorg/overrides.nix
View File

@ -398,11 +398,6 @@ in
let let
attrs = with args; attrs = with args;
if (args.abiCompat == null) then attrs_passed 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 { else if (args.abiCompat == "1.17") then {
name = "xorg-server-1.17.4"; name = "xorg-server-1.17.4";
builder = ./builder.sh; builder = ./builder.sh;