diff options
| author | Elis Hirwing <elis@hirwing.se> | 2020-12-22 23:25:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-22 23:25:35 +0100 |
| commit | aa9bc1fdf99770f08cee41c0c8d69097e41b91da (patch) | |
| tree | eea584f17de51025401a162b0814507f41f9ed6f | |
| parent | 3dfcc7e3a57268d06754b44bf89ff0b728df8de4 (diff) | |
| parent | cc2fee8ac182a7562b4d4e1aa784ee52a10a1437 (diff) | |
Merge pull request #106905 from stephank/imagick-7
phpExtensions.imagick: upgrade to ImageMagick 7
| -rw-r--r-- | pkgs/development/php-packages/imagick/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 504e15ae16dc..8f9eed0c1c30 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -12,9 +12,14 @@ buildPecl { url = "https://github.com/Imagick/imagick/pull/336.patch"; sha256 = "nuRdh02qaMx0s/5OzlfWjyYgZG1zgrYnAjsZ/UVIrUM="; }) + # Fix detection of ImageMagick 7. + (fetchpatch { + url = "https://github.com/Imagick/imagick/commit/09551fbf38c16cdaf4ade7c08744501cd82d2747.patch"; + sha256 = "qUeQHP08kKOzuQdEpR8RSZ18Yhi0U9z24KwQcAx1UVg="; + }) ]; - configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; + configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; |