public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spidermonkey_38: add darwin support

Browse Source
This commit is contained in:
Matthew Bauer 2018-05-20 23:06:51 -05:00
parent 50c158dee8
commit f2dc19703a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/spidermonkey/38.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr }: { stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr
, libobjc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "38.2.1.rc0"; version = "38.2.1.rc0";
@ -13,7 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681"; sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
}; };
buildInputs = [ libffi readline icu zlib nspr ]; buildInputs = [ libffi readline icu zlib nspr ]
++ stdenv.lib.optional stdenv.isDarwin libobjc;
nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
postUnpack = "sourceRoot=\${sourceRoot}/js/src"; postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@ -57,6 +59,6 @@ stdenv.mkDerivation rec {
# TODO: MPL/GPL/LGPL tri-license. # TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.abbradar ]; maintainers = [ maintainers.abbradar ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -7445,7 +7445,9 @@ with pkgs;
spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix {
inherit (darwin) libobjc;
};
spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
spidermonkey = spidermonkey_31; spidermonkey = spidermonkey_31;