diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 17:45:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:44 +0200 |
| commit | ba9b80c7e08953cb63ad0061f33538680ea764db (patch) | |
| tree | 86c6422a6e6554611ef6165cba4494f164f077a7 /pkgs/development/libraries | |
| parent | bf7403f030d1a47822178ceb84ad70b3f21669d1 (diff) | |
| download | nixpkgs-ba9b80c7e08953cb63ad0061f33538680ea764db.tar nixpkgs-ba9b80c7e08953cb63ad0061f33538680ea764db.tar.gz nixpkgs-ba9b80c7e08953cb63ad0061f33538680ea764db.tar.bz2 nixpkgs-ba9b80c7e08953cb63ad0061f33538680ea764db.tar.lz nixpkgs-ba9b80c7e08953cb63ad0061f33538680ea764db.tar.xz nixpkgs-ba9b80c7e08953cb63ad0061f33538680ea764db.tar.zst nixpkgs-ba9b80c7e08953cb63ad0061f33538680ea764db.zip | |
nspr,nss: split into multiple outputs
Hopefully most references are OK.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/nspr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/nss/default.nix | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 55cb75d6b7d..5050741dcbc 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation { sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881"; }; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + preConfigure = '' cd nspr ''; @@ -21,6 +24,7 @@ stdenv.mkDerivation { postInstall = '' find $out -name "*.a" -delete + _moveToOutput share "$dev" # just aclocal ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 27fb7cec81a..fd5834b206e 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite -, includeTools ? false -}: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite }: let @@ -46,15 +44,18 @@ in stdenv.mkDerivation rec { INSTALL_TARGET ''; + outputs = [ "dev" "out" "tools" ]; + preConfigure = "cd nss"; makeFlags = [ - "NSPR_INCLUDE_DIR=${nspr}/include/nspr" - "NSPR_LIB_DIR=${nspr}/lib" + "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr" + "NSPR_LIB_DIR=${nspr.out}/lib" "NSDISTMODE=copy" "BUILD_OPT=1" "SOURCE_PREFIX=\$(out)" "NSS_ENABLE_ECC=1" + "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; @@ -75,8 +76,11 @@ in stdenv.mkDerivation rec { libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" done - '' + stdenv.lib.optionalString (!includeTools) '' - find $out/bin -type f \( -name nss-config -o -delete \) + + _moveToOutput bin "$tools" + _moveToOutput bin/nss-config "$dev" + _moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example + rm "$out"/lib/*.a ''; meta = { |