about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-03-13 16:56:08 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2016-04-23 14:32:19 +0200
commitd72e82498313705df4cf29681c91177c411c5397 (patch)
tree8032e38cf82f5f8862c5d4428e7f6452d9caa683 /pkgs
parentbb13afea6cff95c5d4d6f7a7045d60f141bb7abf (diff)
downloadnixlib-d72e82498313705df4cf29681c91177c411c5397.tar
nixlib-d72e82498313705df4cf29681c91177c411c5397.tar.gz
nixlib-d72e82498313705df4cf29681c91177c411c5397.tar.bz2
nixlib-d72e82498313705df4cf29681c91177c411c5397.tar.lz
nixlib-d72e82498313705df4cf29681c91177c411c5397.tar.xz
nixlib-d72e82498313705df4cf29681c91177c411c5397.tar.zst
nixlib-d72e82498313705df4cf29681c91177c411c5397.zip
pyexiv2: call via pythonPackages
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85e3c5f7b6a2..e9fee1e8e3f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9452,7 +9452,7 @@ in
 
   pycups = pythonPackages.pycups;
 
-  pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
+  pyexiv2 = pythonPackages.pyexiv2;
 
   pygame = pythonPackages.pygame;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0a2e6bc72869..ba084652063c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -149,6 +149,8 @@ in modules // {
 
   pycrypto = callPackage ../development/python-modules/pycrypto { };
 
+  pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
+
   pygame = callPackage ../development/python-modules/pygame { };
 
   pygobject = callPackage ../development/python-modules/pygobject { };