aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/libraries/nss
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nss')
-rw-r--r--nixpkgs/pkgs/development/libraries/nss/3.44.nix144
-rw-r--r--nixpkgs/pkgs/development/libraries/nss/85_security_load-3.44.patch81
-rw-r--r--nixpkgs/pkgs/development/libraries/nss/85_security_load.patch43
-rw-r--r--nixpkgs/pkgs/development/libraries/nss/default.nix92
-rw-r--r--nixpkgs/pkgs/development/libraries/nss/fix-cross-compilation.patch11
5 files changed, 309 insertions, 62 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nss/3.44.nix b/nixpkgs/pkgs/development/libraries/nss/3.44.nix
new file mode 100644
index 00000000000..ad58bfccaee
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/nss/3.44.nix
@@ -0,0 +1,144 @@
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
+
+let
+ nssPEM = fetchurl {
+ url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
+ sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
+ };
+ version = "3.44.4";
+ underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
+
+in stdenv.mkDerivation rec {
+ pname = "nss";
+ inherit version;
+
+ src = fetchurl {
+ url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
+ sha256 = "7ec1a52e20fd9a23e1907eeba8f4f2ecd619dac5d20fa023ec5b4faa1843e847";
+ };
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+ nativeBuildInputs = [ perl ];
+
+ buildInputs = [ zlib sqlite ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ propagatedBuildInputs = [ nspr ];
+
+ prePatch = ''
+ xz -d < ${nssPEM} | patch -p1
+ '';
+
+ patches =
+ [
+ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
+ ./85_security_load-3.44.patch
+ ./ckpem.patch
+ ];
+
+ patchFlags = [ "-p0" ];
+
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
+ '';
+
+ outputs = [ "out" "dev" "tools" ];
+
+ preConfigure = "cd nss";
+
+ makeFlags = let
+ # NSS's build systems expects aarch32 to be called arm; if we pass in armv6l/armv7l, it
+ # fails with a linker error
+ cpu = if stdenv.hostPlatform.isAarch32 then "arm" else stdenv.hostPlatform.parsed.cpu.name;
+ in [
+ "NSPR_INCLUDE_DIR=${nspr.dev}/include"
+ "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"
+ "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"
+ ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+ # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with
+ # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64
+ "OS_TEST=${cpu}"
+ "CPU_ARCH=${cpu}"
+ ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "CROSS_COMPILE=1"
+ "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling
+ ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"
+ ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++";
+
+ NIX_CFLAGS_COMPILE = "-Wno-error";
+
+ # TODO(@oxij): investigate this: `make -n check` works but `make
+ # check` fails with "no rule", same for "installcheck".
+ doCheck = false;
+ doInstallCheck = false;
+
+ postInstall = ''
+ rm -rf $out/private
+ mv $out/public $out/include
+ mv $out/*.OBJ/* $out/
+ rmdir $out/*.OBJ
+
+ ln -s lib $out/lib64
+
+ # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
+ # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a
+ NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'`
+ NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'`
+ NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'`
+ PREFIX="$out"
+
+ mkdir -p $out/lib/pkgconfig
+ sed -e "s,%prefix%,$PREFIX," \
+ -e "s,%exec_prefix%,$PREFIX," \
+ -e "s,%libdir%,$PREFIX/lib64," \
+ -e "s,%includedir%,$dev/include/nss," \
+ -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \
+ -e "s,%NSPR_VERSION%,4.16,g" \
+ pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc
+ chmod 0644 $out/lib/pkgconfig/nss.pc
+
+ sed -e "s,@prefix@,$PREFIX," \
+ -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \
+ -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \
+ -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \
+ pkg/pkg-config/nss-config.in > $out/bin/nss-config
+ chmod 0755 $out/bin/nss-config
+ '';
+
+ postFixup = let
+ isCross = stdenv.hostPlatform != stdenv.buildPlatform;
+ nss = if isCross then buildPackages.nss.tools else "$out";
+ in ''
+ for libname in freebl3 nssdbm3 softokn3
+ do '' +
+ (if stdenv.isDarwin
+ then ''
+ libfile="$out/lib/lib$libname.dylib"
+ DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
+ '' else ''
+ libfile="$out/lib/lib$libname.so"
+ LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
+ '') + ''
+ ${nss}/bin/shlibsign -v -i "$libfile"
+ done
+
+ moveToOutput bin "$tools"
+ moveToOutput bin/nss-config "$dev"
+ moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
+ rm -f "$out"/lib/*.a
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://developer.mozilla.org/en-US/docs/NSS";
+ description = "A set of libraries for development of security-enabled client and server applications";
+ license = licenses.mpl20;
+ platforms = platforms.all;
+ };
+}
diff --git a/nixpkgs/pkgs/development/libraries/nss/85_security_load-3.44.patch b/nixpkgs/pkgs/development/libraries/nss/85_security_load-3.44.patch
new file mode 100644
index 00000000000..132d5a96b29
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/nss/85_security_load-3.44.patch
@@ -0,0 +1,81 @@
+diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c
+--- nss/cmd/shlibsign/shlibsign.c 2017-01-04 15:24:24.000000000 +0100
++++ nss/cmd/shlibsign/shlibsign.c 2017-01-24 14:43:31.030420852 +0100
+@@ -875,6 +875,8 @@
+ goto cleanup;
+ }
+ lib = PR_LoadLibrary(libname);
++ if (!lib)
++ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
+ assert(lib != NULL);
+ if (!lib) {
+ PR_fprintf(PR_STDERR, "loading softokn3 failed");
+diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk
+--- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100
++++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100
+@@ -202,3 +202,6 @@
+
+ # Hide old, deprecated, TLS cipher suite names when building NSS
+ DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
++
++# Nix specific stuff.
++DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
+diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c
+--- nss/lib/pk11wrap/pk11load.c 2017-01-04 15:24:24.000000000 +0100
++++ nss/lib/pk11wrap/pk11load.c 2017-01-24 14:45:06.883485652 +0100
+@@ -440,6 +440,13 @@
+ * unload the library if anything goes wrong from here on out...
+ */
+ library = PR_LoadLibrary(mod->dllName);
++ if ((library == NULL) &&
++ !rindex(mod->dllName, PR_GetDirectorySeparator())) {
++ library = PORT_LoadLibraryFromOrigin(my_shlib_name,
++ (PRFuncPtr) &softoken_LoadDSO,
++ mod->dllName);
++ }
++
+ mod->library = (void *)library;
+
+ if (library == NULL) {
+diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secload.c
+--- nss/lib/util/secload.c 2017-01-04 15:24:24.000000000 +0100
++++ nss/lib/util/secload.c 2017-01-24 14:43:31.030420852 +0100
+@@ -70,9 +70,14 @@
+
+ /* Remove the trailing filename from referencePath and add the new one */
+ c = strrchr(referencePath, PR_GetDirectorySeparator());
++ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
++ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
++ referencePath = NIX_NSS_LIBDIR;
++ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
++ }
+ if (c) {
+ size_t referencePathSize = 1 + c - referencePath;
+- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1);
++ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);
+ if (fullName) {
+ memcpy(fullName, referencePath, referencePathSize);
+ strcpy(fullName + referencePathSize, name);
+@@ -82,6 +87,11 @@
+ #endif
+ libSpec.type = PR_LibSpec_Pathname;
+ libSpec.value.pathname = fullName;
++ if ((referencePathSize >= 4) &&
++ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
++ memcpy(fullName + referencePathSize -4, "lib", 3);
++ }
++ strcpy(fullName + referencePathSize, name);
+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
+ #ifdef PR_LD_ALT_SEARCH_PATH
+ /* allow library's dependencies to be found in the same directory
+@@ -89,6 +99,10 @@
+ | PR_LD_ALT_SEARCH_PATH
+ #endif
+ );
++ if (! dlh) {
++ strcpy(fullName + referencePathSize, name);
++ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);
++ }
+ PORT_Free(fullName);
+ }
+ }
diff --git a/nixpkgs/pkgs/development/libraries/nss/85_security_load.patch b/nixpkgs/pkgs/development/libraries/nss/85_security_load.patch
index 132d5a96b29..2b2cce465ba 100644
--- a/nixpkgs/pkgs/development/libraries/nss/85_security_load.patch
+++ b/nixpkgs/pkgs/development/libraries/nss/85_security_load.patch
@@ -1,7 +1,8 @@
-diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c
---- nss/cmd/shlibsign/shlibsign.c 2017-01-04 15:24:24.000000000 +0100
-+++ nss/cmd/shlibsign/shlibsign.c 2017-01-24 14:43:31.030420852 +0100
-@@ -875,6 +875,8 @@
+diff --git nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c
+index ad8f3b84e..74676d039 100644
+--- nss/cmd/shlibsign/shlibsign.c
++++ nss/cmd/shlibsign/shlibsign.c
+@@ -875,6 +875,8 @@ main(int argc, char **argv)
goto cleanup;
}
lib = PR_LoadLibrary(libname);
@@ -10,37 +11,31 @@ diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/sh
assert(lib != NULL);
if (!lib) {
PR_fprintf(PR_STDERR, "loading softokn3 failed");
-diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk
---- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100
-+++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100
-@@ -202,3 +202,6 @@
-
- # Hide old, deprecated, TLS cipher suite names when building NSS
- DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
-+
-+# Nix specific stuff.
-+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
-diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c
---- nss/lib/pk11wrap/pk11load.c 2017-01-04 15:24:24.000000000 +0100
-+++ nss/lib/pk11wrap/pk11load.c 2017-01-24 14:45:06.883485652 +0100
-@@ -440,6 +440,13 @@
+diff --git nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c
+index 9e7a0a546..a0a23a1a4 100644
+--- nss/lib/pk11wrap/pk11load.c
++++ nss/lib/pk11wrap/pk11load.c
+@@ -466,6 +466,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule)
* unload the library if anything goes wrong from here on out...
*/
library = PR_LoadLibrary(mod->dllName);
++#ifndef NSS_STATIC_SOFTOKEN
+ if ((library == NULL) &&
+ !rindex(mod->dllName, PR_GetDirectorySeparator())) {
+ library = PORT_LoadLibraryFromOrigin(my_shlib_name,
+ (PRFuncPtr) &softoken_LoadDSO,
+ mod->dllName);
+ }
++#endif
+
mod->library = (void *)library;
if (library == NULL) {
-diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secload.c
---- nss/lib/util/secload.c 2017-01-04 15:24:24.000000000 +0100
-+++ nss/lib/util/secload.c 2017-01-24 14:43:31.030420852 +0100
-@@ -70,9 +70,14 @@
+diff --git nss/lib/util/secload.c nss/lib/util/secload.c
+index 12efd2f75..8b74478f6 100644
+--- nss/lib/util/secload.c
++++ nss/lib/util/secload.c
+@@ -70,9 +70,14 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)
/* Remove the trailing filename from referencePath and add the new one */
c = strrchr(referencePath, PR_GetDirectorySeparator());
@@ -56,7 +51,7 @@ diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secl
if (fullName) {
memcpy(fullName, referencePath, referencePathSize);
strcpy(fullName + referencePathSize, name);
-@@ -82,6 +87,11 @@
+@@ -82,6 +87,11 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)
#endif
libSpec.type = PR_LibSpec_Pathname;
libSpec.value.pathname = fullName;
@@ -68,7 +63,7 @@ diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/lib/util/secload.c nss/lib/util/secl
dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
#ifdef PR_LD_ALT_SEARCH_PATH
/* allow library's dependencies to be found in the same directory
-@@ -89,6 +99,10 @@
+@@ -89,6 +99,10 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)
| PR_LD_ALT_SEARCH_PATH
#endif
);
diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix
index d48b5a6ba73..e378cd5554c 100644
--- a/nixpkgs/pkgs/development/libraries/nss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nss/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja }:
let
nssPEM = fetchurl {
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
- version = "3.52";
+ version = "3.56";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@@ -14,12 +14,13 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
- sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha";
+ sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [ perl ];
+ nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
+ ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
buildInputs = [ zlib sqlite ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
@@ -29,10 +30,18 @@ in stdenv.mkDerivation rec {
prePatch = ''
# strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_
xz -d < ${nssPEM} | sed \
- -e '/^-DIRS = builtins $/ s/ $//' \
+ -e 's/-DIRS = builtins $/-DIRS = . builtins/g' \
-e 's/CKO_NETSCAPE_/CKO_NSS_/g' \
-e 's/CKT_NETSCAPE_/CKT_NSS_/g' \
| patch -p1
+
+ patchShebangs nss
+
+ for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do
+ substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env"
+ done
+
+ substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep"
'';
patches =
@@ -40,50 +49,55 @@ in stdenv.mkDerivation rec {
# Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
./85_security_load.patch
./ckpem.patch
+ ./fix-cross-compilation.patch
];
patchFlags = [ "-p0" ];
- postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
- substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
- '';
+ postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)"
+ substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'"
+ '';
outputs = [ "out" "dev" "tools" ];
preConfigure = "cd nss";
- makeFlags = let
- cpu = stdenv.hostPlatform.parsed.cpu.name;
- in [
- "NSPR_INCLUDE_DIR=${nspr.dev}/include"
- "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"
- "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"
- ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
- "OS_TEST=${cpu}"
- "CPU_ARCH=${cpu}"
- "CROSS_COMPILE=1"
- "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling
- ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"
- ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++";
-
- NIX_CFLAGS_COMPILE = "-Wno-error";
-
- # TODO(@oxij): investigate this: `make -n check` works but `make
- # check` fails with "no rule", same for "installcheck".
- doCheck = false;
- doInstallCheck = false;
-
- postInstall = ''
+ buildPhase = let
+ getArch = platform: if platform.isx86_64 then "x64"
+ else if platform.isx86_32 then "ia32"
+ else if platform.isAarch32 then "arm"
+ else if platform.isAarch64 then "arm64"
+ else platform.parsed.cpu.name;
+ # yes, this is correct. nixpkgs uses "host" for the platform the binary will run on whereas nss uses "host" for the platform that the build is running on
+ target = getArch stdenv.hostPlatform;
+ host = getArch stdenv.buildPlatform;
+ in ''
+ runHook preBuild
+
+ sed -i 's|nss_dist_dir="$dist_dir"|nss_dist_dir="'$out'"|;s|nss_dist_obj_dir="$obj_dir"|nss_dist_obj_dir="'$out'"|' build.sh
+ ./build.sh -v --opt \
+ --with-nspr=${nspr.dev}/include:${nspr.out}/lib \
+ --system-sqlite \
+ --enable-legacy-db \
+ --target ${target} \
+ -Dhost_arch=${host} \
+ -Duse_system_zlib=1 \
+ --enable-libpkix \
+ ${stdenv.lib.optionalString stdenv.isDarwin "--clang"} \
+ ${stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"}
+
+ runHook postBuild
+ '';
+
+ NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\"";
+
+ installPhase = ''
+ runHook preInstall
+
rm -rf $out/private
+ find $out -name "*.TOC" -delete
mv $out/public $out/include
- mv $out/*.OBJ/* $out/
- rmdir $out/*.OBJ
ln -s lib $out/lib64
@@ -133,6 +147,8 @@ in stdenv.mkDerivation rec {
moveToOutput bin/nss-config "$dev"
moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
rm -f "$out"/lib/*.a
+
+ runHook postInstall
'';
meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/libraries/nss/fix-cross-compilation.patch b/nixpkgs/pkgs/development/libraries/nss/fix-cross-compilation.patch
new file mode 100644
index 00000000000..42b0620f48d
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/nss/fix-cross-compilation.patch
@@ -0,0 +1,11 @@
+--- nss/nss.gyp
++++ nss/nss.gyp
+@@ -280,7 +280,7 @@
+ 'outputs/': [['exclude', 'nssdbm3']]
+ }],
+ ],
+- 'action': ['<(python)', '<(DEPTH)/coreconf/shlibsign.py', '<@(_inputs)']
++ 'action': ['true']
+ }
+ ],
+ },