diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 03:33:47 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 03:52:06 +0300 |
commit | 6d681786939608872d8fb5c7c3bbc1779256c56a (patch) | |
tree | af67611a227567775a31ae2dc63c5684d83dc5af /pkgs | |
parent | 526aee834029e60130fa10e81e69e42103059cb9 (diff) | |
download | nixlib-6d681786939608872d8fb5c7c3bbc1779256c56a.tar nixlib-6d681786939608872d8fb5c7c3bbc1779256c56a.tar.gz nixlib-6d681786939608872d8fb5c7c3bbc1779256c56a.tar.bz2 nixlib-6d681786939608872d8fb5c7c3bbc1779256c56a.tar.lz nixlib-6d681786939608872d8fb5c7c3bbc1779256c56a.tar.xz nixlib-6d681786939608872d8fb5c7c3bbc1779256c56a.tar.zst nixlib-6d681786939608872d8fb5c7c3bbc1779256c56a.zip |
treewide: Make explicit that 'dev' output of imagemagick is used
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/php-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a0d340826f50..e8af3c2dbf9b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -28,14 +28,14 @@ let imagick31 = assert !isPhp7; buildPecl { name = "imagick-3.1.2"; sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj"; - configureFlags = "--with-imagick=${pkgs.imagemagick}"; + configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; buildInputs = [ pkgs.pkgconfig ]; }; imagick34 = buildPecl { name = "imagick-3.4.0RC4"; sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i"; - configureFlags = "--with-imagick=${pkgs.imagemagick}"; + configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; buildInputs = [ pkgs.pkgconfig ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac7a4cc7bc5f..177607098eaa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22837,7 +22837,7 @@ in modules // { checkPhase = '' cd tests - export MAGICK_HOME="${pkgs.imagemagick}" + export MAGICK_HOME="${pkgs.imagemagick.dev}" export PYTHONPATH=$PYTHONPATH:../ py.test cd .. |