diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-26 19:27:13 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-26 21:06:23 +0200 |
| commit | fb8a2dafd9d264dd80526e5e41067cddc95fcec4 (patch) | |
| tree | f6a8ce9fd91b188038f313b126b4d2b7000d2069 | |
| parent | 16f722500ebc686699271f13e47769c7ad881cbd (diff) | |
| download | nixlib-fb8a2dafd9d264dd80526e5e41067cddc95fcec4.tar nixlib-fb8a2dafd9d264dd80526e5e41067cddc95fcec4.tar.gz nixlib-fb8a2dafd9d264dd80526e5e41067cddc95fcec4.tar.bz2 nixlib-fb8a2dafd9d264dd80526e5e41067cddc95fcec4.tar.lz nixlib-fb8a2dafd9d264dd80526e5e41067cddc95fcec4.tar.xz nixlib-fb8a2dafd9d264dd80526e5e41067cddc95fcec4.tar.zst nixlib-fb8a2dafd9d264dd80526e5e41067cddc95fcec4.zip | |
imagemagick: Drop build-time dependency on Graphviz
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 8 |
1 files 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)''; |