From f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Sep 2017 18:03:42 -0400 Subject: misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed Importantly, this included regenerating pkgs/servers/x11/xorg, to clobber the old sed. --- pkgs/top-level/emscripten-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/top-level/emscripten-packages.nix') diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index c077ae5016b6..7e63041867de 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -13,9 +13,8 @@ with pkgs; rec { pythonSupport = false; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ autoreconfHook pkgconfig ]; buildInputs = old.buildInputs ++ [ zlib nodejs ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ zlib pkgconfig ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; checkPhase = '' -- cgit v1.2.3