diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-31 19:15:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 19:15:17 +0100 |
| commit | 3ef8a645f978220c7f788ba85ba050e19f3fa37a (patch) | |
| tree | c0c73b697a892a31e62f7455a34343a1542f909d | |
| parent | ab5c09745f88fde0c52cd3e7acb1f0eaa96452a8 (diff) | |
| parent | fd892478a11c86b80ec516885b9572c253b75b60 (diff) | |
Merge pull request #111287 from dotlambda/imagemagick6-6.9.11-57
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index ad559a6f2167..66ad424253eb 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices @@ -12,39 +12,19 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else throw "ImageMagick is not supported on this platform."; - - cfg = { - version = "6.9.11-29"; - sha256 = "0adjdpi91ya0g3v7y503n95833m25aibkim5swg5lnwjrba407hg"; - patches = []; - } - # Freeze version on mingw so we don't need to port the patch too often. - # FIXME: This version has multiple security vulnerabilities - // lib.optionalAttrs (stdenv.hostPlatform.isMinGW) { - version = "6.9.2-0"; - sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; - patches = [(fetchpatch { - name = "mingw-build.patch"; - url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/" - + "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch"; - sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0"; - })]; - }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "imagemagick"; - inherit (cfg) version; + version = "6.9.11-60"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; - rev = cfg.version; - inherit (cfg) sha256; + rev = version; + sha256 = "12810882a0kf4zlgyi290z9bjs921m05njbljkjfw6s1hf0mncl0"; }; - patches = cfg.patches; - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny |