public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spidermonkey: Apply 17 patch to 24

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-07 09:50:31 -07:00
parent b7ffacffef
commit 81396388e5
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/interpreters/spidermonkey/24.2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }: { stdenv, fetchurl, pkgconfig, nspr, perl, python, zip, libffi, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "24.2.0"; version = "24.2.0";
@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ]; propagatedBuildInputs = [ nspr ];
buildInputs = [ pkgconfig perl python zip ]; buildInputs = [ pkgconfig perl python zip libffi readline ];
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"; postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@ -20,7 +25,12 @@ stdenv.mkDerivation rec {
export LIBXUL_DIST=$out export LIBXUL_DIST=$out
''; '';
configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ]; configureFlags = [
"--enable-threadsafe"
"--with-system-nspr"
"--with-system-ffi"
"--enable-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
preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";