public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix imagemagick compilation on darwin, because it still includes ghostscript which should not be the case

Browse Source
This commit is contained in:
Sander van der Burg 2013-12-17 11:45:07 +01:00
parent 3b766653c6
commit 010273bf1e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
export DVIDecodeDelegate=${tetex}/bin/dvips export DVIDecodeDelegate=${tetex}/bin/dvips
'' else ""; '' 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-gs-font-dir=${ghostscript}/share/ghostscript/fonts
--with-gslib --with-gslib
'' + '' '' + ''
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = propagatedBuildInputs =
[ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg
libtool jasper libX11 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 ]; buildInputs = [ tetex pkgconfig ];