summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2016-08-19 11:24:42 +0300
committerEfraim Flashner <efraim@flashner.co.il>2016-08-19 11:24:42 +0300
commita78435223b28a0b434a9c0b09c1d761742aa20a7 (patch)
treeb118a80ba575ce0e01824896c9ad65353d4fa96c
parentb9d58a8c31ecbc882507d1bbbf115e496c2d2893 (diff)
downloadguix-a78435223b28a0b434a9c0b09c1d761742aa20a7.tar.gz
gnu: python-pygpgme: Move setuptools to python2-pygpgme.
* gnu/packages/gnupg.scm (python-pygpgme)[inputs]: Remove
python-setuptools.
(python2-pygpgme)[native-inputs]: Add python2-setuptools.
-rw-r--r--gnu/packages/gnupg.scm11
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 4ea3e4cb51..bf506c6bb0 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -414,9 +414,7 @@ and every application benefits from this.")
              (zero? (system* "make" "check")))))))
     (build-system python-build-system)
     (inputs
-     `(;; setuptools required for python-2 variant
-       ("python-setuptools" ,python-setuptools)
-       ("gnupg" ,gnupg-2.0)
+     `(("gnupg" ,gnupg-2.0)
        ("gpgme" ,gpgme)))
     (home-page "https://launchpad.net/pygpgme")
     (synopsis "Python module for working with OpenPGP messages")
@@ -426,7 +424,12 @@ decrypt messages using the OpenPGP format by making use of GPGME.")
     (license license:lgpl2.1+)))
 
 (define-public python2-pygpgme
-  (package-with-python2 python-pygpgme))
+  (let ((base (package-with-python2 python-pygpgme)))
+    (package
+      (inherit base)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools)
+         ,@(package-native-inputs base))))))
 
 (define-public python-gnupg
   (package