summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-09-23 15:37:53 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-09-23 15:37:53 +0200
commit8d62b019f19ca07f416f2aed368c6d4a94ec5a6f (patch)
treea7c324cbb3cf0de72ade1e85cb235f526848372a
parent8d7cd6064d90cb4ed7682d0b68dbcd92576d832f (diff)
downloadnixos-8d62b019f19ca07f416f2aed368c6d4a94ec5a6f.tar
nixos-8d62b019f19ca07f416f2aed368c6d4a94ec5a6f.tar.gz
nixos-8d62b019f19ca07f416f2aed368c6d4a94ec5a6f.tar.bz2
nixos-8d62b019f19ca07f416f2aed368c6d4a94ec5a6f.tar.xz
nixos-8d62b019f19ca07f416f2aed368c6d4a94ec5a6f.zip
needs makeWrapper
-rw-r--r--users/gkleen@hel.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix
index 14ffb73e..fa4989e2 100644
--- a/users/gkleen@hel.nix
+++ b/users/gkleen@hel.nix
@@ -10,9 +10,11 @@
10 ''; 10 '';
11 }; 11 };
12 gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { 12 gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: {
13 buildInputs = [ pkgs.makeWrapper ];
13 postBuild = '' 14 postBuild = ''
14 wrapProgram $out/bin/gpg \ 15 wrapProgram $out/bin/gpg \
15 --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" 16 --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" \
17 --run "systemctl --user import-environment DISPLAY"
16 ''; 18 '';
17 postInstall = '' 19 postInstall = ''
18 ln -s $out/bin/gpg2 $out/bin/gpg 20 ln -s $out/bin/gpg2 $out/bin/gpg