ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

spidermonkey_17: get darwin working

Browse Source 
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:
Matthew Bauer 2018-06-15 18:12:15 -04:00
parent c2cfb6c57a
commit e1983175e8
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/interpreters/spidermonkey/17.nix
View File

@ -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 { stdenv.mkDerivation rec {
version = "17.0.0"; version = "17.0.0";
@ -14,7 +16,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ]; propagatedBuildInputs = [ nspr ];
nativeBuildInputs = [ pkgconfig ]; 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"; postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@ -48,7 +52,7 @@ stdenv.mkDerivation rec {
"--enable-threadsafe" "--enable-threadsafe"
"--with-system-nspr" "--with-system-nspr"
"--with-system-ffi" "--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 # 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 # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html
echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls
'' + stdenv.lib.optionalString stdenv.isLinux ''
paxmark m shell/js17 paxmark m shell/js17
paxmark mr jsapi-tests/jsapi-tests paxmark mr jsapi-tests/jsapi-tests
''; '';
@ -78,7 +83,6 @@ stdenv.mkDerivation rec {
homepage = https://developer.mozilla.org/en/SpiderMonkey; homepage = https://developer.mozilla.org/en/SpiderMonkey;
# TODO: MPL/GPL/LGPL tri-license. # TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.goibhniu ]; maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

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

@ -7514,7 +7514,10 @@ with pkgs;
spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; };
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 {
inherit (darwin) libobjc;
stdenv = gccStdenv;
};
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; inherit (darwin) libobjc;