summary refs log tree commit diff
path: root/pkgs/top-level/php-packages.nix
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-10-13 22:27:52 +0200
committerGraham Christensen <graham@grahamc.com>2016-10-13 20:33:16 -0400
commit957a5bdcf3ebd8b653c5e37ca18e7cf53a9d0dc8 (patch)
treea1be542aeaef2b1168d41d3c7c847f2e7c738e22 /pkgs/top-level/php-packages.nix
parent241cd0e5db7545010e57da736006cf2d16744b16 (diff)
downloadnixpkgs-957a5bdcf3ebd8b653c5e37ca18e7cf53a9d0dc8.tar
nixpkgs-957a5bdcf3ebd8b653c5e37ca18e7cf53a9d0dc8.tar.gz
nixpkgs-957a5bdcf3ebd8b653c5e37ca18e7cf53a9d0dc8.tar.bz2
nixpkgs-957a5bdcf3ebd8b653c5e37ca18e7cf53a9d0dc8.tar.lz
nixpkgs-957a5bdcf3ebd8b653c5e37ca18e7cf53a9d0dc8.tar.xz
nixpkgs-957a5bdcf3ebd8b653c5e37ca18e7cf53a9d0dc8.tar.zst
nixpkgs-957a5bdcf3ebd8b653c5e37ca18e7cf53a9d0dc8.zip
phpPackages.imagick: 3.4.0RC4 -> 3.4.3RC1
Drops imagick31 as the current version also supports PHP 5.x.
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
-rw-r--r--pkgs/top-level/php-packages.nix17
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 9bebfa3d915..74d4e1707a1 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -23,20 +23,11 @@ let
     sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd";
   };
 
-  imagick = if isPhp7 then imagick34 else imagick31;
-
-  imagick31 = assert !isPhp7; buildPecl {
-    name = "imagick-3.1.2";
-    sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj";
-    configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
-    buildInputs = [ pkgs.pkgconfig ];
-  };
-
-  imagick34 = buildPecl {
-    name = "imagick-3.4.0RC4";
-    sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i";
+  imagick = buildPecl {
+    name = "imagick-3.4.3RC1";
+    sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh";
     configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
-    buildInputs = [ pkgs.pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
   };
 
   # No support for PHP 7 yet