From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: [PATCH 1/2] gnu: Add minimal pinentry. Date: Tue, 26 Apr 2016 17:03:18 +0300 Message-ID: <1461679399-32659-2-git-send-email-efraim@flashner.co.il> References: <1461679399-32659-1-git-send-email-efraim@flashner.co.il> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1av3bS-0000hs-AI for guix-devel@gnu.org; Tue, 26 Apr 2016 10:04:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1av3bN-0007cb-Bv for guix-devel@gnu.org; Tue, 26 Apr 2016 10:04:38 -0400 Received: from flashner.co.il ([178.62.234.194]:48929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1av3bN-0007cQ-62 for guix-devel@gnu.org; Tue, 26 Apr 2016 10:04:33 -0400 Received: from localhost.localdomain (ool-45706c69.dyn.optonline.net [69.112.108.105]) by flashner.co.il (Postfix) with ESMTPSA id 6A89540315 for ; Tue, 26 Apr 2016 14:04:32 +0000 (UTC) In-Reply-To: <1461679399-32659-1-git-send-email-efraim@flashner.co.il> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/gnupg.scm (pinentry): Rename pinentry-gtk, inherit from pinentry. [arguments]: Add pinentry-tty flag. [inputs]: Use gtk+-2, glib for pinentry-gtk2 only. [description]: Modify description based on inputs. --- gnu/packages/gnupg.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index d447007..71f6ece 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -580,21 +580,33 @@ including tools for signing keys, keyring analysis, and party preparation. (base32 "1cp7wjqr6nx31mdclr61s2h84ijqjl0ph99kgj4vyawpjj1j1633")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-pinentry-tty"))) (inputs `(("ncurses" ,ncurses) ("libassuan" ,libassuan) - ("libsecret" ,libsecret "out") - ("gtk+" ,gtk+-2) - ("glib" ,glib))) + ("libsecret" ,libsecret "out"))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://gnupg.org/aegypten2/") (synopsis "GnuPG's interface to passphrase input") (description - "Pinentry provides a console and a GTK+ GUI that allows users to -enter a passphrase when `gpg' or `gpg2' is run and needs it.") + "Pinentry provides a console that allows users to enter a passphrase when +@code{gpg} or @code{gpg2} is run and needs it.") (license license:gpl2+))) +(define-public pinentry-gtk2 + (package + (inherit pinentry) + (name "pinentry-gtk2") + (inputs + `(("gtk+" ,gtk+-2) + ("glib" ,glib) + ,@(package-inputs pinentry))) + (description + "Pinentry provides a console and a GTK+ GUI that allows users to enter a +passphrase when @code{gpg} or @code{gpg2} is run and needs it."))) + (define-public paperkey (package (name "paperkey") -- 2.8.1