diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-27 00:06:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 00:06:31 +0000 |
| commit | 088eead34aa975dbd76c36d9a85c539d188551e0 (patch) | |
| tree | 1b7d3372f83fd3bb3395f429b52d80863aecf764 /pkgs/applications/graphics | |
| parent | 59a37c822b7d029047a46587460b37d0a4caf6f1 (diff) | |
| parent | ea4a87537cfdc83eebcd1804a5ec51057018784f (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 1e34527ce6c42..8c7e3f2c4aa01 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 @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-48"; + version = "7.1.0-49"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-ExGeZVqRajuYcck0JrIFGDEam4PfUCXF/jI2dudHh+E="; + hash = "sha256-5EbmAPEUPFMY8VDJmXfcFuUzFI0xVw7fpVteSI9gotg="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -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 |