diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-06-10 21:51:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 21:51:01 -0500 |
| commit | 9f648fbc95f4931d3299b73ecc02b2ddb3d74bab (patch) | |
| tree | 6fd9e9d264a88f80e167f061700894e29fea10fa /pkgs | |
| parent | 452e58f27b0f5889d46768492bc6005c2960bdd5 (diff) | |
| parent | 8b2d735d1a04ad7bac167433fbad6d010a76944d (diff) | |
| download | nixpkgs-9f648fbc95f4931d3299b73ecc02b2ddb3d74bab.tar nixpkgs-9f648fbc95f4931d3299b73ecc02b2ddb3d74bab.tar.gz nixpkgs-9f648fbc95f4931d3299b73ecc02b2ddb3d74bab.tar.bz2 nixpkgs-9f648fbc95f4931d3299b73ecc02b2ddb3d74bab.tar.lz nixpkgs-9f648fbc95f4931d3299b73ecc02b2ddb3d74bab.tar.xz nixpkgs-9f648fbc95f4931d3299b73ecc02b2ddb3d74bab.tar.zst nixpkgs-9f648fbc95f4931d3299b73ecc02b2ddb3d74bab.zip | |
Merge pull request #90107 from marsam/fix-nss-darwin
nss: fix build on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/nss/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5251c680361..622d11c3160 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -66,6 +66,7 @@ in stdenv.mkDerivation rec { "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}" |