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

imagemagick: Drop build-time dependency on Graphviz

Browse Source
This commit is contained in:
Eelco Dolstra 2013-09-26 19:27:13 +02:00
parent 16f722500e
commit fb8a2dafd9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
, fetchurl , fetchurl
, bzip2 , bzip2
, freetype , freetype
, graphviz
, ghostscript ? null , ghostscript ? null
, libjpeg , libjpeg
, libpng , libpng
@ -27,6 +26,8 @@ stdenv.mkDerivation rec {
sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg";
}; };
enableParallelBuilding = true;
preConfigure = if tetex != null then preConfigure = if tetex != null then
'' ''
export DVIDecodeDelegate=${tetex}/bin/dvips export DVIDecodeDelegate=${tetex}/bin/dvips
@ -42,9 +43,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = propagatedBuildInputs =
[ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg [ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg
libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; libtool jasper libX11
] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript;
buildInputs = [ tetex graphviz ]; buildInputs = [ tetex ];
postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)'';