summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level/emscripten-packages.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-09-05 18:03:42 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-09-21 15:49:54 -0400
commitf8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 (patch)
treee853e7da55b09acd1d622991491c1a696f9857ef /pkgs/top-level/emscripten-packages.nix
parent531e4b80c97002a542beb8fe356177ebd66cdd8e (diff)
misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to clobber the old sed.
Diffstat (limited to 'pkgs/top-level/emscripten-packages.nix')
-rw-r--r--pkgs/top-level/emscripten-packages.nix3
1 files changed, 1 insertions, 2 deletions
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 = ''