diff options
| author | Zhaofeng Li <hello@zhaofeng.li> | 2021-06-01 09:27:32 -0700 |
|---|---|---|
| committer | Zhaofeng Li <hello@zhaofeng.li> | 2021-06-01 12:23:41 -0700 |
| commit | 345e777888b6293a192c6e3828acd32ba83697a2 (patch) | |
| tree | 0a8a3c7dc5e2ac1167ba24e650b7c2fd1cddf587 /pkgs/development/libraries/nss | |
| parent | 1f831f0552f92680c3868794a9ffe00e2ee7f8cb (diff) | |
| download | nixpkgs-345e777888b6293a192c6e3828acd32ba83697a2.tar nixpkgs-345e777888b6293a192c6e3828acd32ba83697a2.tar.gz nixpkgs-345e777888b6293a192c6e3828acd32ba83697a2.tar.bz2 nixpkgs-345e777888b6293a192c6e3828acd32ba83697a2.tar.lz nixpkgs-345e777888b6293a192c6e3828acd32ba83697a2.tar.xz nixpkgs-345e777888b6293a192c6e3828acd32ba83697a2.tar.zst nixpkgs-345e777888b6293a192c6e3828acd32ba83697a2.zip | |
nss: Set NSS_USE_64=1 for 64-bit platforms
The config script does that automatically for a few architectures [1], but on 64-bit platforms that are not listed (like riscv64) the freebl build fails. Debian always adds the USE_64=1 flag when compiling on 64-bit architectures (they use legacy make instead of gyp), and we should do that as well to fix the general problem at the cost of a mass rebuild. [1] https://hg.mozilla.org/projects/nss/file/0ef2306a623f8fcd90f094281678f3ee9e7e4738/coreconf/config.gypi#l212 [2] https://salsa.debian.org/mozilla-team/nss/-/blob/c446c61808a3a30bb0c6c62cc6628ede3f7bc205/debian/rules#L66
Diffstat (limited to 'pkgs/development/libraries/nss')
| -rw-r--r-- | pkgs/development/libraries/nss/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 962204268d7..66278021bd3 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { runHook postBuild ''; - NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\""; + NIX_CFLAGS_COMPILE = "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\" " + lib.optionalString stdenv.hostPlatform.is64bit "-DNSS_USE_64=1"; installPhase = '' runHook preInstall |