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/applications | |
parent | 2a905c8616662b0e5fd5d4d3979ac4a3bc914b15 (diff) |
treewide: move fixDarwinDylibNames to nativeBuildInputs
This hook runs at build time and depends on executing
install_name_tool from binutils.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/klayout/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/logic/z3/default.nix | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index b7a1a8c4a6f9..b8b21e71c930 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 zlib libtool libwebp - ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ]; - nativeBuildInputs = [ xz ]; + nativeBuildInputs = [ xz ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 5f6c679f3ba1..0a8d7ce547f3 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch , python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, makeWrapper, fixDarwinDylibNames +, which, perl, makeWrapper }: mkDerivation rec { diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 88aafcdae222..dd71cf2cb1a8 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"; }; - buildInputs = [ python fixDarwinDylibNames ] + nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ python ] ++ optional javaBindings jdk ++ optionals ocamlBindings [ ocaml findlib zarith ] ; |