diff options
| author | Sander van der Burg <sander@conference-compass.com> | 2013-12-17 11:45:07 +0100 |
|---|---|---|
| committer | Sander van der Burg <sander@conference-compass.com> | 2013-12-17 11:45:07 +0100 |
| commit | 010273bf1ec2080d292076a2aae35056a6d7881d (patch) | |
| tree | 5f086acd0aa2e28ce5127a61477c18dd4eda9c65 /pkgs/applications/graphics/ImageMagick | |
| parent | 3b766653c6d40e435c934e0f8e966be60cfbf40d (diff) | |
| download | nixlib-010273bf1ec2080d292076a2aae35056a6d7881d.tar nixlib-010273bf1ec2080d292076a2aae35056a6d7881d.tar.gz nixlib-010273bf1ec2080d292076a2aae35056a6d7881d.tar.bz2 nixlib-010273bf1ec2080d292076a2aae35056a6d7881d.tar.lz nixlib-010273bf1ec2080d292076a2aae35056a6d7881d.tar.xz nixlib-010273bf1ec2080d292076a2aae35056a6d7881d.tar.zst nixlib-010273bf1ec2080d292076a2aae35056a6d7881d.zip | |
Fix imagemagick compilation on darwin, because it still includes ghostscript which should not be the case
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index aa0bdbfe56ce..a3d6eca4fa6e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { export DVIDecodeDelegate=${tetex}/bin/dvips '' else ""; - configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' + configureFlags = "" + stdenv.lib.optionalString (stdenv.system != "x86_64-darwin") '' --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gslib '' + '' @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg libtool jasper libX11 - ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; + ] ++ stdenv.lib.optional (stdenv.system != "x86_64-darwin") ghostscript; buildInputs = [ tetex pkgconfig ]; |