From 35b4c8be511d6fac45e93fd5e65a24e126e736a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Oct 2017 09:38:42 +0200 Subject: [PATCH] xorg-server: fixup build after #29039 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... --- pkgs/servers/x11/xorg/overrides.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 20b75867948..45df7244176 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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;