diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-20 23:06:51 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-21 19:55:37 -0500 |
| commit | f2dc19703a2c5e4d66442bfa9e720f3c9d811c38 (patch) | |
| tree | 40e348e8a77a05d90045733363cd41d20c641f48 | |
| parent | 50c158dee86916ca5f4f2d553469f7583d7fd04b (diff) | |
| download | nixpkgs-f2dc19703a2c5e4d66442bfa9e720f3c9d811c38.tar nixpkgs-f2dc19703a2c5e4d66442bfa9e720f3c9d811c38.tar.gz nixpkgs-f2dc19703a2c5e4d66442bfa9e720f3c9d811c38.tar.bz2 nixpkgs-f2dc19703a2c5e4d66442bfa9e720f3c9d811c38.tar.lz nixpkgs-f2dc19703a2c5e4d66442bfa9e720f3c9d811c38.tar.xz nixpkgs-f2dc19703a2c5e4d66442bfa9e720f3c9d811c38.tar.zst nixpkgs-f2dc19703a2c5e4d66442bfa9e720f3c9d811c38.zip | |
spidermonkey_38: add darwin support
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/38.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index f8fefd204e5..133679495a5 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -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 { version = "38.2.1.rc0"; @@ -13,7 +14,8 @@ stdenv.mkDerivation rec { 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 ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -57,6 +59,6 @@ stdenv.mkDerivation rec { # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2649357e1b..b4a530a5f45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7445,7 +7445,9 @@ with pkgs; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.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 = spidermonkey_31; |