diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-15 18:12:15 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-16 16:41:03 -0400 |
| commit | e1983175e870f40e6c6f3cc2260434fbaef6e0a7 (patch) | |
| tree | c018b0008b72b9bbe500cfb4615f784b008529d1 /pkgs/development/interpreters | |
| parent | c2cfb6c57a7620bce94f883a04675d68be64ed7f (diff) | |
| download | nixlib-e1983175e870f40e6c6f3cc2260434fbaef6e0a7.tar nixlib-e1983175e870f40e6c6f3cc2260434fbaef6e0a7.tar.gz nixlib-e1983175e870f40e6c6f3cc2260434fbaef6e0a7.tar.bz2 nixlib-e1983175e870f40e6c6f3cc2260434fbaef6e0a7.tar.lz nixlib-e1983175e870f40e6c6f3cc2260434fbaef6e0a7.tar.xz nixlib-e1983175e870f40e6c6f3cc2260434fbaef6e0a7.tar.zst nixlib-e1983175e870f40e6c6f3cc2260434fbaef6e0a7.zip | |
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).
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/17.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index 9c47ebe79b6e..e2eef0fab695 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -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; }; } - |