diff options
| author | Leo Famulari <leo@famulari.name> | 2020-03-28 11:34:54 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2020-03-28 11:50:41 -0400 |
| commit | e4257138fe1d924c56c9979b75319585b9251fb7 (patch) | |
| tree | af4d62e85b543eb5fd142f4ab01a232d74d8ce0d /gnu/packages/patches | |
| parent | 388b432cea4ae2bb9bf4b044026b7764ab002e1e (diff) | |
| download | guix-patches-e4257138fe1d924c56c9979b75319585b9251fb7.tar guix-patches-e4257138fe1d924c56c9979b75319585b9251fb7.tar.gz | |
Revert "gnu: gnupg: Use ~/.guix-profile/bin/pinentry by default."
This commit didn't work:
https://issues.guix.gnu.org/issue/24076#13
This reverts commit c7af9d0b5ebaa1fdb08ff5d8a56004998bcd8103.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/gnupg-default-pinentry.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gnu/packages/patches/gnupg-default-pinentry.patch b/gnu/packages/patches/gnupg-default-pinentry.patch deleted file mode 100644 index 272f4b53dc..0000000000 --- a/gnu/packages/patches/gnupg-default-pinentry.patch +++ /dev/null @@ -1,15 +0,0 @@ -Default to the pinentry program installed in ~/.guix-profile. - -diff --git a/common/homedir.c b/common/homedir.c -index e9e75d0..74e0aaf 100644 ---- a/common/homedir.c -+++ b/common/homedir.c -@@ -968,7 +968,7 @@ get_default_pinentry_name (int reset) - } names[] = { - /* The first entry is what we return in case we found no - other pinentry. */ -- { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S }, -+ { gnupg_homedir, "/.guix-profile/bin/pinentry" }, - #ifdef HAVE_W32_SYSTEM - /* Try Gpg4win directory (with bin and without.) */ - { w32_rootdir, "\\..\\Gpg4win\\bin\\pinentry.exe" }, |