summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-09-23 15:55:45 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-09-23 15:55:45 +0200
commitf05e7cc2522d2e3ae6be4e751ec2f0237cc2ba7c (patch)
tree95697b6e874719a5b4144d6cf3f41c88a3886f3d
parent9cdc0f09aec325f79d77265ffeba01c17f7c4b88 (diff)
downloadnixos-f05e7cc2522d2e3ae6be4e751ec2f0237cc2ba7c.tar
nixos-f05e7cc2522d2e3ae6be4e751ec2f0237cc2ba7c.tar.gz
nixos-f05e7cc2522d2e3ae6be4e751ec2f0237cc2ba7c.tar.bz2
nixos-f05e7cc2522d2e3ae6be4e751ec2f0237cc2ba7c.tar.xz
nixos-f05e7cc2522d2e3ae6be4e751ec2f0237cc2ba7c.zip
Revert "gnupg always needs X"
This reverts commit 8d7cd6064d90cb4ed7682d0b68dbcd92576d832f.
-rw-r--r--users/gkleen@hel.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix
index 14ffb73e..28548a84 100644
--- a/users/gkleen@hel.nix
+++ b/users/gkleen@hel.nix
@@ -10,10 +10,6 @@
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 '';
17 postInstall = '' 13 postInstall = ''
18 ln -s $out/bin/gpg2 $out/bin/gpg 14 ln -s $out/bin/gpg2 $out/bin/gpg
19 ''; 15 '';
@@ -24,7 +20,7 @@
24 20
25 chromium = { 21 chromium = {
26 enableWideVine = true; 22 enableWideVine = true;
27 enablePepperFlash = true; 23 hiDPI = true;
28 }; 24 };
29 25
30 mpv = { 26 mpv = {