From a78435223b28a0b434a9c0b09c1d761742aa20a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 19 Aug 2016 11:24:42 +0300 Subject: [PATCH] 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. --- gnu/packages/gnupg.scm | 11 +++++++---- 1 file 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