diff options
| author | Michael Eden <themichaeleden@gmail.com> | 2019-03-20 16:05:45 -0400 |
|---|---|---|
| committer | Michael Eden <themichaeleden@gmail.com> | 2019-03-25 13:30:53 -0400 |
| commit | 8f4dcedbb011277c73b71c0075371cab3041acc9 (patch) | |
| tree | e7f9c0d81980e7ba48408fa57b49fc91edd6edfa /pkgs/development/libraries/nss | |
| parent | 5b00f65402ff18295a3bbab5bd6f98699a7a5e9f (diff) | |
| download | nixpkgs-8f4dcedbb011277c73b71c0075371cab3041acc9.tar nixpkgs-8f4dcedbb011277c73b71c0075371cab3041acc9.tar.gz nixpkgs-8f4dcedbb011277c73b71c0075371cab3041acc9.tar.bz2 nixpkgs-8f4dcedbb011277c73b71c0075371cab3041acc9.tar.lz nixpkgs-8f4dcedbb011277c73b71c0075371cab3041acc9.tar.xz nixpkgs-8f4dcedbb011277c73b71c0075371cab3041acc9.tar.zst nixpkgs-8f4dcedbb011277c73b71c0075371cab3041acc9.zip | |
nss: cross compile support
Diffstat (limited to 'pkgs/development/libraries/nss')
| -rw-r--r-- | pkgs/development/libraries/nss/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 056f98472be..5e562dd4145 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }: let nssPEM = fetchurl { @@ -17,7 +17,11 @@ in stdenv.mkDerivation rec { sha256 = "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88"; }; - buildInputs = [ perl zlib sqlite ] + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ perl ]; + + buildInputs = [ zlib sqlite ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ nspr ]; @@ -43,7 +47,9 @@ in stdenv.mkDerivation rec { preConfigure = "cd nss"; - makeFlags = [ + makeFlags = let + cpu = stdenv.hostPlatform.parsed.cpu.name; + in [ "NSPR_INCLUDE_DIR=${nspr.dev}/include" "NSPR_LIB_DIR=${nspr.out}/lib" "NSDISTMODE=copy" @@ -52,6 +58,12 @@ in stdenv.mkDerivation rec { "NSS_ENABLE_ECC=1" "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" + "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc" + "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++"; @@ -95,7 +107,10 @@ in stdenv.mkDerivation rec { chmod 0755 $out/bin/nss-config ''; - postFixup = '' + 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 @@ -106,7 +121,7 @@ in stdenv.mkDerivation rec { libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '') + '' - $out/bin/shlibsign -v -i "$libfile" + ${nss}/bin/shlibsign -v -i "$libfile" done moveToOutput bin "$tools" |