From 6b2379f43fe74d27fc20a61af73b436f2bf8a562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Sep 2013 18:13:26 +0200 Subject: [PATCH] imagemagick: add link for $out/include/ImageMagick For transition. Fixes calibre build, at least. --- pkgs/applications/graphics/ImageMagick/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index a5d8b22c7844..1c3bff2e36d7 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; }; + preConfigure = if tetex != null then + '' + export DVIDecodeDelegate=${tetex}/bin/dvips + '' else ""; + configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gslib @@ -41,10 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ tetex graphviz ]; - preConfigure = if tetex != null then - '' - export DVIDecodeDelegate=${tetex}/bin/dvips - '' else ""; + postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; meta = { homepage = http://www.imagemagick.org/;