public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Make explicit that 'dev' output of imagemagick is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-08-23 03:33:47 +03:00
parent 526aee8340
commit 6d68178693
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/php-packages.nix
View File

@ -28,14 +28,14 @@ let
imagick31 = assert !isPhp7; buildPecl { imagick31 = assert !isPhp7; buildPecl {
name = "imagick-3.1.2"; name = "imagick-3.1.2";
sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj"; sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj";
configureFlags = "--with-imagick=${pkgs.imagemagick}"; configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
buildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.pkgconfig ];
}; };
imagick34 = buildPecl { imagick34 = buildPecl {
name = "imagick-3.4.0RC4"; name = "imagick-3.4.0RC4";
sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i"; sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i";
configureFlags = "--with-imagick=${pkgs.imagemagick}"; configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
buildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.pkgconfig ];
}; };

2
pkgs/top-level/python-packages.nix
View File

@ -22837,7 +22837,7 @@ in modules // {
checkPhase = '' checkPhase = ''
cd tests cd tests
export MAGICK_HOME="${pkgs.imagemagick}" export MAGICK_HOME="${pkgs.imagemagick.dev}"
export PYTHONPATH=$PYTHONPATH:../ export PYTHONPATH=$PYTHONPATH:../
py.test py.test
cd .. cd ..