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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-04-18 13:00:40 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
'';
makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1";

12
pkgs/development/interpreters/spidermonkey/17.0.nix
View File

@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij";
};
outputs = [ "dev" "out" "lib" ];
propagatedBuildInputs = [ nspr ];
buildInputs = [ pkgconfig perl python zip libffi readline ];
@@ -21,11 +23,14 @@ stdenv.mkDerivation rec {
'';
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
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-nspr"
"--with-system-ffi"
@@ -49,7 +54,10 @@ stdenv.mkDerivation rec {
paxmark mr jsapi-tests/jsapi-tests
'';
postInstall = ''rm "$out"/lib/*.a''; # halve the output size
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++";

2
pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
export LIBXUL_DIST=$out
'';

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

@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
};
outputs = [ "dev" "out" "lib" ];
propagatedBuildInputs = [ nspr ];
buildInputs = [ pkgconfig perl python zip libffi readline ];
@@ -21,11 +23,14 @@ stdenv.mkDerivation rec {
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
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-nspr"
"--with-system-ffi"
@@ -40,6 +45,11 @@ stdenv.mkDerivation rec {
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;