From b4a006448f641e525d7fd2acfd2183269c2e42b5 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 22 Sep 2022 10:46:04 +1000 Subject: [PATCH] ImageMagick: Enable Pango when enabling librsvg as the latter requires Pango anyway --- pkgs/applications/graphics/ImageMagick/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 1e34527ce6c4..878027463c9a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,7 +18,7 @@ , libpngSupport ? true, libpng , liblqr1Support ? true, liblqr1 , librawSupport ? true, libraw -, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg +, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg, pango , libtiffSupport ? true, libtiff , libxml2Support ? true, libxml2 , openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { "--with-frozenpaths" (lib.withFeatureAs (arch != null) "gcc-arch" arch) (lib.withFeature librsvgSupport "rsvg") + (lib.withFeature librsvgSupport "pango") (lib.withFeature liblqr1Support "lqr") (lib.withFeature libjxlSupport "jxl") (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") @@ -88,7 +89,10 @@ stdenv.mkDerivation rec { ++ lib.optional djvulibreSupport djvulibre ++ lib.optional libjxlSupport libjxl ++ lib.optional openexrSupport openexr - ++ lib.optional librsvgSupport librsvg + ++ lib.optionals librsvgSupport [ + librsvg + pango + ] ++ lib.optional openjpegSupport openjpeg ++ lib.optionals stdenv.isDarwin [ ApplicationServices