nspr,nss: split into multiple outputs

Hopefully most references are OK.

+43 -38
+2 -2
pkgs/applications/audio/spotify/default.nix
··· 68 68 69 69 ln -s ${openssl.out}/lib/libssl.so $libdir/libssl.so.1.0.0 70 70 ln -s ${openssl.out}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 71 - ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so 72 - ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so 71 + ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so 72 + ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so 73 73 74 74 mkdir -p $out/bin 75 75
+1 -1
pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
··· 15 15 # !!! fix this 16 16 preBuild = 17 17 '' 18 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr}/include/nspr" 18 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr.dev}/include/nspr" 19 19 echo $NIX_CFLAGS_COMPILE 20 20 ''; 21 21
+5 -5
pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
··· 1 - args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss 1 + args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss, nspr 2 2 , gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python 3 3 , libtool, automake, autoconf, gstreamer 4 4 , gtk, glib ··· 19 19 20 20 buildInputs = [gtkspell aspell 21 21 gstreamer startupnotification 22 - libxml2 openssl nss 22 + libxml2 openssl nss nspr 23 23 libXScrnSaver ncurses scrnsaverproto 24 24 libX11 xproto kbproto GConf avahi 25 25 dbus dbus_glib glib python ··· 29 29 pkgconfig gtk perl perlXMLParser gettext 30 30 ]; 31 31 32 - configureFlags="--with-nspr-includes=${nss}/include/nspr" 33 - + " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss" 34 - + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include" 32 + configureFlags="--with-nspr-includes=${nspr.dev}/include/nspr" 33 + + " --with-nspr-libs=${nspr.out}/lib --with-nss-includes=${nss.dev}/include/nss" 34 + + " --with-nss-libs=${nss.out}/lib --with-ncurses-headers=${ncurses.dev}/include" 35 35 + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl"; 36 36 37 37 preBuild = fullDepEntry (''
+1 -1
pkgs/applications/networking/instant-messengers/oneteam/default.nix
··· 43 43 '' ["minInit" "doUnpack"]; 44 44 45 45 setVars=a.noDepEntry '' 46 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" 46 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" 47 47 ''; 48 48 49 49 cmakeBuildDir="cmake-build";
+5 -5
pkgs/applications/networking/instant-messengers/pidgin/default.nix
··· 41 41 patches = [./pidgin-makefile.patch ./add-search-path.patch ]; 42 42 43 43 configureFlags = [ 44 - "--with-nspr-includes=${nspr}/include/nspr" 45 - "--with-nspr-libs=${nspr}/lib" 46 - "--with-nss-includes=${nss}/include/nss" 47 - "--with-nss-libs=${nss}/lib" 48 - "--with-ncurses-headers=${ncurses}/include" 44 + "--with-nspr-includes=${nspr.dev}/include/nspr" 45 + "--with-nspr-libs=${nspr.out}/lib" 46 + "--with-nss-includes=${nss.dev}/include/nss" 47 + "--with-nss-libs=${nss.out}/lib" 48 + "--with-ncurses-headers=${ncurses.dev}/include" 49 49 "--disable-meanwhile" 50 50 "--disable-nm" 51 51 "--disable-tcl"
+1 -1
pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
··· 32 32 configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" 33 33 "--disable-libcryptui" ]; 34 34 35 - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; 35 + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; 36 36 37 37 enableParallelBuilding = true; 38 38
+1 -1
pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
··· 27 27 gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common 28 28 gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; 29 29 30 - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; 30 + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; 31 31 32 32 enableParallelBuilding = true; 33 33
+2 -2
pkgs/desktops/gnome-3/3.16/core/folks/default.nix
··· 23 23 24 24 configureFlags = "--disable-fatal-warnings"; 25 25 26 - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" 27 - "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; 26 + NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" 27 + "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; 28 28 29 29 enableParallelBuilding = true; 30 30
+1 -1
pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix
··· 27 27 configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" 28 28 "--disable-libcryptui" ]; 29 29 30 - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; 30 + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; 31 31 32 32 enableParallelBuilding = true; 33 33
+1 -1
pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
··· 20 20 gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common 21 21 gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; 22 22 23 - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; 23 + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; 24 24 25 25 enableParallelBuilding = true; 26 26
+2 -2
pkgs/desktops/gnome-3/3.18/core/folks/default.nix
··· 23 23 24 24 configureFlags = "--disable-fatal-warnings"; 25 25 26 - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" 27 - "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; 26 + NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" 27 + "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; 28 28 29 29 enableParallelBuilding = true; 30 30
+1 -1
pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
··· 23 23 ''; 24 24 25 25 preConfigure = '' 26 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" 26 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" 27 27 ''; 28 28 29 29 makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1";
+1 -1
pkgs/development/interpreters/spidermonkey/17.0.nix
··· 21 21 ''; 22 22 23 23 preConfigure = '' 24 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" 24 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" 25 25 export LIBXUL_DIST=$out 26 26 ''; 27 27
+1 -1
pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
··· 16 16 postUnpack = "sourceRoot=\${sourceRoot}/js/src"; 17 17 18 18 preConfigure = '' 19 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" 19 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" 20 20 export LIBXUL_DIST=$out 21 21 ''; 22 22
+1 -1
pkgs/development/interpreters/spidermonkey/24.2.nix
··· 21 21 postUnpack = "sourceRoot=\${sourceRoot}/js/src"; 22 22 23 23 preConfigure = '' 24 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" 24 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" 25 25 export LIBXUL_DIST=$out 26 26 ''; 27 27
+4
pkgs/development/libraries/nspr/default.nix
··· 10 10 sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881"; 11 11 }; 12 12 13 + outputs = [ "dev" "out" ]; 14 + outputBin = "dev"; 15 + 13 16 preConfigure = '' 14 17 cd nspr 15 18 ''; ··· 21 24 22 25 postInstall = '' 23 26 find $out -name "*.a" -delete 27 + _moveToOutput share "$dev" # just aclocal 24 28 ''; 25 29 26 30 enableParallelBuilding = true;
+11 -7
pkgs/development/libraries/nss/default.nix
··· 1 - { stdenv, fetchurl, nspr, perl, zlib, sqlite 2 - , includeTools ? false 3 - }: 1 + { stdenv, fetchurl, nspr, perl, zlib, sqlite }: 4 2 5 3 let 6 4 ··· 46 44 INSTALL_TARGET 47 45 ''; 48 46 47 + outputs = [ "dev" "out" "tools" ]; 48 + 49 49 preConfigure = "cd nss"; 50 50 51 51 makeFlags = [ 52 - "NSPR_INCLUDE_DIR=${nspr}/include/nspr" 53 - "NSPR_LIB_DIR=${nspr}/lib" 52 + "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr" 53 + "NSPR_LIB_DIR=${nspr.out}/lib" 54 54 "NSDISTMODE=copy" 55 55 "BUILD_OPT=1" 56 56 "SOURCE_PREFIX=\$(out)" 57 57 "NSS_ENABLE_ECC=1" 58 + "USE_SYSTEM_ZLIB=1" 58 59 "NSS_USE_SYSTEM_SQLITE=1" 59 60 ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; 60 61 ··· 75 76 libfile="$out/lib/lib$libname.so" 76 77 LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" 77 78 done 78 - '' + stdenv.lib.optionalString (!includeTools) '' 79 - find $out/bin -type f \( -name nss-config -o -delete \) 79 + 80 + _moveToOutput bin "$tools" 81 + _moveToOutput bin/nss-config "$dev" 82 + _moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example 83 + rm "$out"/lib/*.a 80 84 ''; 81 85 82 86 meta = {
+1 -1
pkgs/tools/package-management/rpm/default.nix
··· 12 12 13 13 # Note: we don't add elfutils to buildInputs, since it provides a 14 14 # bad `ld' and other stuff. 15 - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${elfutils}/include"; 15 + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${elfutils}/include"; 16 16 17 17 NIX_CFLAGS_LINK = "-L${elfutils}/lib"; 18 18
+1 -4
pkgs/top-level/all-packages.nix
··· 7690 7690 nspr = callPackage ../development/libraries/nspr { }; 7691 7691 7692 7692 nss = lowPrio (callPackage ../development/libraries/nss { }); 7693 + nssTools = nss.tools; 7693 7694 7694 7695 nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; 7695 - 7696 - nssTools = callPackage ../development/libraries/nss { 7697 - includeTools = true; 7698 - }; 7699 7696 7700 7697 ntk = callPackage ../development/libraries/audio/ntk { }; 7701 7698