diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-10-21 19:25:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 19:25:48 +0200 |
| commit | bb0b872b61125b7b1785df72bf91d8f863aa39de (patch) | |
| tree | c2d83a7db978cb6ec8f4c436602fbd92da1ca18c /pkgs/applications | |
| parent | 507a5e95dae135d22740a1282e5e6096e3e71ed7 (diff) | |
| parent | 5b5d38a7e7a52489c7f9134f0a4d153a459d7d8f (diff) | |
Merge pull request #100388 from thefloweringash/darwin-dylib-names-hook
treewide: move fixDarwinDylibNames to nativeBuildInputs
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 ] ; |