summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-07-17 18:43:05 +0200
committerRobin Gloster <mail@glob.in>2017-07-17 18:45:37 +0200
commitb8d92a7840dd1bb377f83df9aae651624187ebf0 (patch)
tree17075b332bc5d062a24548aac425236eb7c3d98f /nixos
parentb4ee24d5b12c2bdd93dcf5c1e33e433ea4f41659 (diff)
downloadnixlib-b8d92a7840dd1bb377f83df9aae651624187ebf0.tar
nixlib-b8d92a7840dd1bb377f83df9aae651624187ebf0.tar.gz
nixlib-b8d92a7840dd1bb377f83df9aae651624187ebf0.tar.bz2
nixlib-b8d92a7840dd1bb377f83df9aae651624187ebf0.tar.lz
nixlib-b8d92a7840dd1bb377f83df9aae651624187ebf0.tar.xz
nixlib-b8d92a7840dd1bb377f83df9aae651624187ebf0.tar.zst
nixlib-b8d92a7840dd1bb377f83df9aae651624187ebf0.zip
programs.gnupg: use extraInit instead of interactiveShellInit
Otherwise some programmes cannot use the GPG agent, e.g. applications
started from dmenu.

Behaviour was changed in #26888, this reverts that part.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/gnupg.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index ea46d5934d9f..8af55f38992f 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -77,7 +77,7 @@ in
 
     systemd.packages = [ pkgs.gnupg ];
 
-    environment.interactiveShellInit = ''
+    environment.extraInit = ''
       # Bind gpg-agent to this TTY if gpg commands are used.
       export GPG_TTY=$(tty)