diff options
author | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-09-23 15:32:56 +0200 |
---|---|---|
committer | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-09-23 15:32:56 +0200 |
commit | 8d7cd6064d90cb4ed7682d0b68dbcd92576d832f (patch) | |
tree | ed1e9e34e2431c3454759ed4c25f183cf556a34e | |
parent | d255f50559b881aeaba6b1bee5b79da86ab0f7c8 (diff) | |
download | nixos-8d7cd6064d90cb4ed7682d0b68dbcd92576d832f.tar nixos-8d7cd6064d90cb4ed7682d0b68dbcd92576d832f.tar.gz nixos-8d7cd6064d90cb4ed7682d0b68dbcd92576d832f.tar.bz2 nixos-8d7cd6064d90cb4ed7682d0b68dbcd92576d832f.tar.xz nixos-8d7cd6064d90cb4ed7682d0b68dbcd92576d832f.zip |
gnupg always needs X
-rw-r--r-- | users/gkleen@hel.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index 28548a84..14ffb73e 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix | |||
@@ -10,6 +10,10 @@ | |||
10 | ''; | 10 | ''; |
11 | }; | 11 | }; |
12 | gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { | 12 | gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { |
13 | postBuild = '' | ||
14 | wrapProgram $out/bin/gpg \ | ||
15 | --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" | ||
16 | ''; | ||
13 | postInstall = '' | 17 | postInstall = '' |
14 | ln -s $out/bin/gpg2 $out/bin/gpg | 18 | ln -s $out/bin/gpg2 $out/bin/gpg |
15 | ''; | 19 | ''; |
@@ -20,7 +24,7 @@ | |||
20 | 24 | ||
21 | chromium = { | 25 | chromium = { |
22 | enableWideVine = true; | 26 | enableWideVine = true; |
23 | hiDPI = true; | 27 | enablePepperFlash = true; |
24 | }; | 28 | }; |
25 | 29 | ||
26 | mpv = { | 30 | mpv = { |