diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 18:56:09 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:19:02 +0200 |
commit | f014217a553fe5fdc05d831a23891c6c69ff4396 (patch) | |
tree | 9369b42de0d2652fb4b5eb0484c069c957114dad | |
parent | fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248 (diff) | |
download | nixlib-f014217a553fe5fdc05d831a23891c6c69ff4396.tar nixlib-f014217a553fe5fdc05d831a23891c6c69ff4396.tar.gz nixlib-f014217a553fe5fdc05d831a23891c6c69ff4396.tar.bz2 nixlib-f014217a553fe5fdc05d831a23891c6c69ff4396.tar.lz nixlib-f014217a553fe5fdc05d831a23891c6c69ff4396.tar.xz nixlib-f014217a553fe5fdc05d831a23891c6c69ff4396.tar.zst nixlib-f014217a553fe5fdc05d831a23891c6c69ff4396.zip |
spidermonkey-{17,24}: split the dev and lib outputs
-rw-r--r-- | pkgs/applications/editors/edbrowse/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/17.0.nix | 10 | ||||
-rw-r--r-- | pkgs/development/interpreters/spidermonkey/24.2.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/plowshare/default.nix | 2 |
4 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index d969552ecde4..712ede2e316f 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -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 { diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index 9cbfde596c45..8ef3d953bfa4 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -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++"; diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix index 2c59b2c435a9..d235ab04526b 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.2.nix @@ -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; diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 418a9a1b9a33..a1a12a82471d 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -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 ''; |