diff options
| author | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-09-23 15:55:44 +0200 |
|---|---|---|
| committer | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2016-09-23 15:55:44 +0200 |
| commit | 9cdc0f09aec325f79d77265ffeba01c17f7c4b88 (patch) | |
| tree | ed1e9e34e2431c3454759ed4c25f183cf556a34e | |
| parent | 10e18e2b8d96d2742d070a652ee2aa656e8b0780 (diff) | |
| download | nixos-9cdc0f09aec325f79d77265ffeba01c17f7c4b88.tar nixos-9cdc0f09aec325f79d77265ffeba01c17f7c4b88.tar.gz nixos-9cdc0f09aec325f79d77265ffeba01c17f7c4b88.tar.bz2 nixos-9cdc0f09aec325f79d77265ffeba01c17f7c4b88.tar.xz nixos-9cdc0f09aec325f79d77265ffeba01c17f7c4b88.zip | |
Revert "needs makeWrapper"
This reverts commit 8d62b019f19ca07f416f2aed368c6d4a94ec5a6f.
| -rw-r--r-- | users/gkleen@hel.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index fa4989e2..14ffb73e 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix | |||
| @@ -10,11 +10,9 @@ | |||
| 10 | ''; | 10 | ''; |
| 11 | }; | 11 | }; |
| 12 | gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { | 12 | gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { |
| 13 | buildInputs = [ pkgs.makeWrapper ]; | ||
| 14 | postBuild = '' | 13 | postBuild = '' |
| 15 | wrapProgram $out/bin/gpg \ | 14 | wrapProgram $out/bin/gpg \ |
| 16 | --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" \ | 15 | --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" |
| 17 | --run "systemctl --user import-environment DISPLAY" | ||
| 18 | ''; | 16 | ''; |
| 19 | postInstall = '' | 17 | postInstall = '' |
| 20 | ln -s $out/bin/gpg2 $out/bin/gpg | 18 | ln -s $out/bin/gpg2 $out/bin/gpg |