diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 18:03:42 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:54 -0400 |
| commit | f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 (patch) | |
| tree | e853e7da55b09acd1d622991491c1a696f9857ef /pkgs/development/interpreters/spidermonkey | |
| parent | 531e4b80c97002a542beb8fe356177ebd66cdd8e (diff) | |
| download | nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.gz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.bz2 nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.lz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.xz nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.zst nixpkgs-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.zip | |
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/development/interpreters/spidermonkey')
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/1.8.5.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 418ee90533f..9a14beb856b 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213; buildInputs = [ perl python2 zip ]; - nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else []; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; |