alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pythonPackages.Wand: Clean up and switch to imagemagick7

Browse source 
http://docs.wand-py.org/en/0.5.0/whatsnew/0.5.html#imagemagick-7-support
This commit is contained in:
Silvan Mosberger 2019-01-28 23:34:28 +01:00
parent 07c3f81aa6
commit 4ba2d947ff
No known key found for this signature in database
GPG key ID: 9424360B4B85C9E7
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/development/python-modules/Wand/default.nix
View file

@ -1,18 +1,10 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, imagemagick
, pytest
, psutil
, memory_profiler
, pytest_xdist
, imagemagick7Big
}:
let
soext = stdenv.hostPlatform.extensions.sharedLibrary;
magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${soext}";
imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}";
in buildPythonPackage rec {
buildPythonPackage rec {
pname = "Wand";
version = "0.5.0";
@ -21,16 +13,10 @@ in buildPythonPackage rec {
sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj";
};
checkInputs = [ pytest pytest_xdist memory_profiler psutil ];
buildInputs = [ imagemagick ];
inherit magick_wand_library imagemagick_library;
postPatch = ''
substituteInPlace wand/api.py --replace \
"magick_home = os.environ.get('MAGICK_HOME')" \
"magick_home = '${imagemagick}'"
"magick_home = '${imagemagick7Big}'"
'';
# tests not included with pypi release
@ -40,9 +26,6 @@ in buildPythonPackage rec {
description = "Ctypes-based simple MagickWand API binding for Python";
homepage = http://wand-py.org/;
license = [ licenses.mit ];
};
passthru = {
inherit imagemagick;
maintainers = with maintainers; [ infinisil ];
};
}

4
pkgs/top-level/python-packages.nix
View file

@ -4164,9 +4164,7 @@ in {
websockets = callPackage ../development/python-modules/websockets { };
Wand = callPackage ../development/python-modules/Wand {
imagemagick = pkgs.imagemagickBig;
};
Wand = callPackage ../development/python-modules/Wand { };
wcwidth = callPackage ../development/python-modules/wcwidth { };