dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nspr,nss: split into multiple outputs

Browse Source 
Hopefully most references are OK.
This commit is contained in:
Vladimír Čunát 2015-10-05 17:45:54 +02:00
parent bf7403f030
commit ba9b80c7e0
19 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/spotify/default.nix
View File

@ -68,8 +68,8 @@ stdenv.mkDerivation {
ln -s ${openssl.out}/lib/libssl.so $libdir/libssl.so.1.0.0
ln -s ${openssl.out}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
mkdir -p $out/bin

2
pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# !!! fix this
preBuild =
''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr}/include/nspr"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr.dev}/include/nspr"
echo $NIX_CFLAGS_COMPILE
'';

10
pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
View File

@ -1,4 +1,4 @@
args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss
args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss, nspr
, gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python
, libtool, automake, autoconf, gstreamer
, gtk, glib
@ -19,7 +19,7 @@ rec {
buildInputs = [gtkspell aspell
gstreamer startupnotification
libxml2 openssl nss
libxml2 openssl nss nspr
libXScrnSaver ncurses scrnsaverproto
libX11 xproto kbproto GConf avahi
dbus dbus_glib glib python
@ -29,9 +29,9 @@ rec {
pkgconfig gtk perl perlXMLParser gettext
];
configureFlags="--with-nspr-includes=${nss}/include/nspr"
+ " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss"
+ " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
configureFlags="--with-nspr-includes=${nspr.dev}/include/nspr"
+ " --with-nspr-libs=${nspr.out}/lib --with-nss-includes=${nss.dev}/include/nss"
+ " --with-nss-libs=${nss.out}/lib --with-ncurses-headers=${ncurses.dev}/include"
+ " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
preBuild = fullDepEntry (''

2
pkgs/applications/networking/instant-messengers/oneteam/default.nix
View File

@ -43,7 +43,7 @@ rec {
'' ["minInit" "doUnpack"];
setVars=a.noDepEntry ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
'';
cmakeBuildDir="cmake-build";

10
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -41,11 +41,11 @@ stdenv.mkDerivation rec {
patches = [./pidgin-makefile.patch ./add-search-path.patch ];
configureFlags = [
"--with-nspr-includes=${nspr}/include/nspr"
"--with-nspr-libs=${nspr}/lib"
"--with-nss-includes=${nss}/include/nss"
"--with-nss-libs=${nss}/lib"
"--with-ncurses-headers=${ncurses}/include"
"--with-nspr-includes=${nspr.dev}/include/nspr"
"--with-nspr-libs=${nspr.out}/lib"
"--with-nss-includes=${nss.dev}/include/nss"
"--with-nss-libs=${nss.out}/lib"
"--with-ncurses-headers=${ncurses.dev}/include"
"--disable-meanwhile"
"--disable-nm"
"--disable-tcl"

2
pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
View File

@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
"--disable-libcryptui" ];
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;

4
pkgs/desktops/gnome-3/3.16/core/folks/default.nix
View File

@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-fatal-warnings";
NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
"-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss"
"-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix
View File

@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
"--disable-libcryptui" ];
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;

4
pkgs/desktops/gnome-3/3.18/core/folks/default.nix
View File

@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-fatal-warnings";
NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
"-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss"
"-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
enableParallelBuilding = true;

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";

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

@ -21,7 +21,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"
export LIBXUL_DIST=$out
'';

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
'';

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

@ -21,7 +21,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
'';

4
pkgs/development/libraries/nspr/default.nix
View File

@ -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;

18
pkgs/development/libraries/nss/default.nix
View File

@ -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 = {

2
pkgs/tools/package-management/rpm/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${elfutils}/include";
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${elfutils}/include";
NIX_CFLAGS_LINK = "-L${elfutils}/lib";

5
pkgs/top-level/all-packages.nix
View File

@ -7690,13 +7690,10 @@ let
nspr = callPackage ../development/libraries/nspr { };
nss = lowPrio (callPackage ../development/libraries/nss { });
nssTools = nss.tools;
nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
nssTools = callPackage ../development/libraries/nss {
includeTools = true;
};
ntk = callPackage ../development/libraries/audio/ntk { };
ntrack = callPackage ../development/libraries/ntrack { };