mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues Wiki Activity

spidermonkey-{17,24}: split the dev and lib outputs

Browse source
This commit is contained in:
Vladimír Čunát 2015-10-13 18:56:09 +02:00
parent fa6ddd7fa6
commit f014217a55
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/editors/edbrowse/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
'';
NIX_CFLAGS_COMPILE = "-I${spidermonkey_24}/include/mozjs-24";
NIX_CFLAGS_COMPILE = "-I${spidermonkey_24.dev}/include/mozjs-24";
makeFlags = "-C src prefix=$(out)";
src = fetchurl {

10
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 ];
@ -25,7 +27,10 @@ stdenv.mkDerivation rec {
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++";

10
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 ];
@ -25,7 +27,10 @@ stdenv.mkDerivation rec {
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;

2
pkgs/tools/misc/plowshare/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
make PREFIX="$out" install
for fn in plow{del,down,list,up}; do
wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.bin}/bin"
wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.out}/bin"
done
'';