public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: move fixDarwinDylibNames to nativeBuildInputs

Browse Source 
This hook runs at build time and depends on executing
install_name_tool from binutils.
This commit is contained in:
Andrew Childs
2020-10-21 13:26:53 +09:00
parent 2a905c8616
commit 722d02a720
36 changed files with 92 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/nss/3.44.nix
+3 -3
View File
@@ -19,10 +19,10 @@ in stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
nativeBuildInputs = [ perl ]
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ zlib sqlite ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ zlib sqlite ];
propagatedBuildInputs = [ nspr ];
pkgs/development/libraries/nss/default.nix
+2 -3
View File
@@ -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 ];