diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-03-01 21:45:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-01 21:45:01 +0100 |
commit | 4150920a51c911b45a39f512b4292c1de63990c3 (patch) | |
tree | e65eb46d60c68bf707fb393ed96a4b92c23d6550 /pkgs | |
parent | 8dcfa44a538396939f5b777b1ef43a453aeecaa6 (diff) | |
parent | fff88b814c6bec72aee960e843d14936317a5e09 (diff) | |
download | nixlib-4150920a51c911b45a39f512b4292c1de63990c3.tar nixlib-4150920a51c911b45a39f512b4292c1de63990c3.tar.gz nixlib-4150920a51c911b45a39f512b4292c1de63990c3.tar.bz2 nixlib-4150920a51c911b45a39f512b4292c1de63990c3.tar.lz nixlib-4150920a51c911b45a39f512b4292c1de63990c3.tar.xz nixlib-4150920a51c911b45a39f512b4292c1de63990c3.tar.zst nixlib-4150920a51c911b45a39f512b4292c1de63990c3.zip |
Merge pull request #23294 from yurrriq/update/pkgs/applications/graphics/graphicsmagick
graphicsmagick: fix for darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 4b75d0ccc6b6..f655979c2ccc 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 -, libwebp, quantumdepth ? 8 }: +, libwebp, quantumdepth ? 8, fixDarwinDylibNames }: let version = "1.3.25"; in @@ -53,7 +53,8 @@ stdenv.mkDerivation { buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 zlib libtool libwebp - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; nativeBuildInputs = [ xz ]; |