spidermonkey_17: get darwin working
LLVM building is apparently broken. This is a similar fix to what was done in spidermonkey_38. enableReadline flag is also introduced (defaults to true except on darwin).
This commit is contained in:
parent
c2cfb6c57a
commit
e1983175e8
@ -1,4 +1,6 @@
|
||||
{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }:
|
||||
{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi
|
||||
, enableReadline ? (!stdenv.isDarwin), readline
|
||||
, libobjc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "17.0.0";
|
||||
@ -14,7 +16,9 @@ stdenv.mkDerivation rec {
|
||||
propagatedBuildInputs = [ nspr ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ perl python2 zip libffi readline ];
|
||||
buildInputs = [ perl python2 zip libffi readline ]
|
||||
++ stdenv.lib.optional enableReadline readline
|
||||
++ stdenv.lib.optional stdenv.isDarwin libobjc;
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
|
||||
|
||||
@ -48,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
"--enable-threadsafe"
|
||||
"--with-system-nspr"
|
||||
"--with-system-ffi"
|
||||
"--enable-readline"
|
||||
(if enableReadline then "--enable-readline" else "--disable-readline")
|
||||
];
|
||||
|
||||
# hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
|
||||
@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
|
||||
# https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html
|
||||
echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls
|
||||
|
||||
'' + stdenv.lib.optionalString stdenv.isLinux ''
|
||||
paxmark m shell/js17
|
||||
paxmark mr jsapi-tests/jsapi-tests
|
||||
'';
|
||||
@ -78,7 +83,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://developer.mozilla.org/en/SpiderMonkey;
|
||||
# TODO: MPL/GPL/LGPL tri-license.
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -7514,7 +7514,10 @@ with pkgs;
|
||||
spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; };
|
||||
|
||||
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 {
|
||||
inherit (darwin) libobjc;
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
|
||||
spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
|
||||
inherit (darwin) libobjc;
|
||||
|
Loading…
Reference in New Issue
Block a user