diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 17:26:13 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:53 -0400 |
| commit | 531e4b80c97002a542beb8fe356177ebd66cdd8e (patch) | |
| tree | 4fb5b90d44ecb5a7b15fdc7d6e10bda66f4542f0 /pkgs/top-level/emscripten-packages.nix | |
| parent | fd9c7eb2e8c1755b606cb0d7dab2ba0bb93e36ed (diff) | |
| download | nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.gz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.bz2 nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.lz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.xz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.zst nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.zip | |
misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`
Only acts on one-line dependency lists.
Diffstat (limited to 'pkgs/top-level/emscripten-packages.nix')
| -rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ed9e09802b7d..c077ae5016b6 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -13,7 +13,8 @@ with pkgs; rec { pythonSupport = false; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ autoreconfHook pkgconfig zlib nodejs ]; + 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..."; @@ -39,7 +40,8 @@ with pkgs; rec { xmlmirror = buildEmscriptenPackage rec { name = "xmlmirror"; - buildInputs = [ autoconf automake libtool pkgconfig gnumake libxml2 nodejs + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool gnumake libxml2 nodejs python openjdk json_c zlib ]; src = fetchgit { |