Skip to content

Commit

Permalink
Revert "spidermonkey_24: remove"
Browse files Browse the repository at this point in the history
This reverts commit 5dacc53.
  • Loading branch information
vcunat committed Feb 4, 2017
1 parent 45fcefd commit 94a7a80
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 0 deletions.
62 changes: 62 additions & 0 deletions pkgs/development/interpreters/spidermonkey/24.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline, icu }:

stdenv.mkDerivation rec {
version = "24.2.0";
name = "spidermonkey-${version}";

src = fetchurl {
url = "mirror://mozilla/js/mozjs-${version}.tar.bz2";
sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
};

outputs = [ "out" "dev" "lib" ];

propagatedBuildInputs = [ nspr ];

buildInputs = [ pkgconfig perl python2 zip libffi readline icu ];

postPatch = ''
# Fixes an issue with version detection under perl 5.22.x
sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
'';

postUnpack = "sourceRoot=\${sourceRoot}/js/src";

preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
export LIBXUL_DIST=$out
'';

setOutputFlags = false;
configureFlags = [
"--libdir=$(lib)/lib"
"--includedir=$(dev)/include"
"--enable-threadsafe"
"--with-system-icu"
"--with-system-nspr"
"--with-system-ffi"
"--enable-readline"
];

# hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";

enableParallelBuilding = true;

doCheck = true;
preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522

postInstall = ''
rm "$lib"/lib/*.a # halve the output size
moveToOutput "bin/js*-config" "$dev" # break the cycle
'';

meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;
# TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5927,6 +5927,7 @@ with pkgs;

spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.nix { };
spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
spidermonkey = spidermonkey_31;
Expand Down

0 comments on commit 94a7a80

Please sign in to comment.