From fb8a2dafd9d264dd80526e5e41067cddc95fcec4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Sep 2013 19:27:13 +0200 Subject: imagemagick: Drop build-time dependency on Graphviz --- pkgs/applications/graphics/ImageMagick/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 1c3bff2e36d7..c2a661c82fdf 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -2,7 +2,6 @@ , fetchurl , bzip2 , freetype -, graphviz , ghostscript ? null , libjpeg , libpng @@ -27,6 +26,8 @@ stdenv.mkDerivation rec { sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; }; + enableParallelBuilding = true; + preConfigure = if tetex != null then '' export DVIDecodeDelegate=${tetex}/bin/dvips @@ -42,9 +43,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ 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)''; -- cgit 1.4.1