From 0c90ed5505e04540b1982c04993369fb9706a916 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Sep 2016 09:23:43 +0200 Subject: gnupg: Honor $GUIX_GPG_COMMAND and default to 'gpg'. * guix/gnupg.scm (%gpg-command): Change to "gpg" or $GUIX_GPG_COMMAND. --- guix/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/gnupg.scm b/guix/gnupg.scm index d1d8b377e1..ef8f9000dc 100644 --- a/guix/gnupg.scm +++ b/guix/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010, 2011, 2013, 2014 Ludovic Courtès +;;; Copyright © 2010, 2011, 2013, 2014, 2016 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. @@ -40,7 +40,7 @@ (define %gpg-command ;; The GnuPG 2.x command-line program name. - (make-parameter "gpg2")) + (make-parameter (or (getenv "GUIX_GPG_COMMAND") "gpg"))) (define %openpgp-key-server ;; The default key server. Note that keys.gnupg.net appears to be -- cgit v1.2.3