diff options
author | Andrew Childs <lorne@cons.org.nz> | 2020-10-13 16:03:49 +0900 |
---|---|---|
committer | Andrew Childs <lorne@cons.org.nz> | 2020-10-21 13:26:53 +0900 |
commit | 722d02a720124e55bf0bc0c6b4c4d6f4dc70d096 (patch) | |
tree | 7ea2e7b195ef8f027f8d25fb4b99952187c3805f /pkgs/development/libraries/nss/default.nix | |
parent | 2a905c8616662b0e5fd5d4d3979ac4a3bc914b15 (diff) | |
download | nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.gz nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.bz2 nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.lz nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.xz nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.tar.zst nixpkgs-722d02a720124e55bf0bc0c6b4c4d6f4dc70d096.zip |
treewide: move fixDarwinDylibNames to nativeBuildInputs
This hook runs at build time and depends on executing install_name_tool from binutils.
Diffstat (limited to 'pkgs/development/libraries/nss/default.nix')
-rw-r--r-- | pkgs/development/libraries/nss/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e9ca475802d..395617aa7bc 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -20,10 +20,9 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; - buildInputs = [ zlib sqlite ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ zlib sqlite ]; propagatedBuildInputs = [ nspr ]; |