diff options
author | Michael Eden <themichaeleden@gmail.com> | 2019-03-26 22:07:10 -0400 |
---|---|---|
committer | Michael Eden <themichaeleden@gmail.com> | 2019-03-26 22:07:10 -0400 |
commit | 6261601b00001f88ec03cb33f745d000a47f5286 (patch) | |
tree | e347ce686b5f82d8729625317cd675cadb8f7eca /pkgs | |
parent | 8f4dcedbb011277c73b71c0075371cab3041acc9 (diff) | |
download | nixlib-6261601b00001f88ec03cb33f745d000a47f5286.tar nixlib-6261601b00001f88ec03cb33f745d000a47f5286.tar.gz nixlib-6261601b00001f88ec03cb33f745d000a47f5286.tar.bz2 nixlib-6261601b00001f88ec03cb33f745d000a47f5286.tar.lz nixlib-6261601b00001f88ec03cb33f745d000a47f5286.tar.xz nixlib-6261601b00001f88ec03cb33f745d000a47f5286.tar.zst nixlib-6261601b00001f88ec03cb33f745d000a47f5286.zip |
nss: move CPU_ARCH and OS_TEST to cross comp
Diffstat (limited to 'pkgs')
-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 5e562dd4145a..e00c62709173 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -59,9 +59,9 @@ in stdenv.mkDerivation rec { "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}" - ] ++ 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" |