Merge pull request #100388 from thefloweringash/darwin-dylib-names-hook

treewide: move fixDarwinDylibNames to nativeBuildInputs
2020-10-21 19:25:48 +02:00
parent 507a5e95da 5b5d38a7e7
commit bb0b872b61
36 changed files with 91 additions and 76 deletions
@@ -146,11 +146,11 @@ stdenv.mkDerivation {

  enableParallelBuilding = true;

-  nativeBuildInputs = [ which ];
+  nativeBuildInputs = [ which ]
+    ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
  depsBuildBuild = [ buildPackages.stdenv.cc ];
  buildInputs = [ expat zlib bzip2 libiconv ]
    ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu
-    ++ optional stdenv.isDarwin fixDarwinDylibNames
    ++ optional enablePython python
    ++ optional enableNumpy python.pkgs.numpy;