From 8d7cd6064d90cb4ed7682d0b68dbcd92576d832f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:32:56 +0200 Subject: gnupg always needs X --- users/gkleen@hel.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 @@ ''; }; gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { + postBuild = '' + wrapProgram $out/bin/gpg \ + --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" + ''; postInstall = '' ln -s $out/bin/gpg2 $out/bin/gpg ''; @@ -20,7 +24,7 @@ chromium = { enableWideVine = true; - hiDPI = true; + enablePepperFlash = true; }; mpv = { -- cgit v1.2.3 From 8d62b019f19ca07f416f2aed368c6d4a94ec5a6f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:37:53 +0200 Subject: needs makeWrapper --- users/gkleen@hel.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 @@ ''; }; gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { + buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/gpg \ - --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" + --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" \ + --run "systemctl --user import-environment DISPLAY" ''; postInstall = '' ln -s $out/bin/gpg2 $out/bin/gpg -- cgit v1.2.3 From a17c9c5dcb9c958683ab571ec1261ce459217569 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:41:05 +0200 Subject: move scripting to own derivation --- users/gkleen@hel.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index fa4989e2..fb65e343 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix @@ -10,16 +10,18 @@ ''; }; gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { - buildInputs = [ pkgs.makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/gpg \ - --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" \ - --run "systemctl --user import-environment DISPLAY" - ''; postInstall = '' ln -s $out/bin/gpg2 $out/bin/gpg ''; }); + gnupg-script = with pkgs; writeScript "gnupg-script" '' + #!${stdenv.shell} + + while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done + + systemctl --user import-environment DISPLAY + exec ${gnupg}/bin/gpg2 --daemon + ''; } // (import ../utils/nix/default.nix) {}; allowUnfree = true; -- cgit v1.2.3 From e2354a8edecf781f34ad2979e975e739534cda77 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:42:06 +0200 Subject: move script to bin --- users/gkleen@hel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index fb65e343..159ad9d9 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix @@ -14,7 +14,7 @@ ln -s $out/bin/gpg2 $out/bin/gpg ''; }); - gnupg-script = with pkgs; writeScript "gnupg-script" '' + gnupg-daemon = with pkgs; writeScriptBin "gnupg-daemon" '' #!${stdenv.shell} while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done -- cgit v1.2.3 From ba918de31593958413325f65d2ed2ba992e4b018 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:44:20 +0200 Subject: =?UTF-8?q?don=C2=B4t=20fork=20gpg-agent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- users/gkleen@hel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index 159ad9d9..3a74702c 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix @@ -20,7 +20,7 @@ while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done systemctl --user import-environment DISPLAY - exec ${gnupg}/bin/gpg2 --daemon + exec ${gnupg}/bin/gpg2 ''; } // (import ../utils/nix/default.nix) {}; -- cgit v1.2.3 From 64e4b3ad255e680388512b0a19174679166844c0 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:48:26 +0200 Subject: still need --server --- users/gkleen@hel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index 3a74702c..9a81711b 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix @@ -20,7 +20,7 @@ while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done systemctl --user import-environment DISPLAY - exec ${gnupg}/bin/gpg2 + exec ${gnupg}/bin/gpg2 --server ''; } // (import ../utils/nix/default.nix) {}; -- cgit v1.2.3 From 48863a88cbb1e5ab0ea07f0cb42ed24983d4976c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:55:28 +0200 Subject: Revert "still need --server" This reverts commit 64e4b3ad255e680388512b0a19174679166844c0. --- users/gkleen@hel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index 9a81711b..3a74702c 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix @@ -20,7 +20,7 @@ while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done systemctl --user import-environment DISPLAY - exec ${gnupg}/bin/gpg2 --server + exec ${gnupg}/bin/gpg2 ''; } // (import ../utils/nix/default.nix) {}; -- cgit v1.2.3 From 7e443cf990091b1344fd0ba89f66418b3885f47d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:55:38 +0200 Subject: =?UTF-8?q?Revert=20"don=C2=B4t=20fork=20gpg-agent"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ba918de31593958413325f65d2ed2ba992e4b018. --- users/gkleen@hel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index 3a74702c..159ad9d9 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix @@ -20,7 +20,7 @@ while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done systemctl --user import-environment DISPLAY - exec ${gnupg}/bin/gpg2 + exec ${gnupg}/bin/gpg2 --daemon ''; } // (import ../utils/nix/default.nix) {}; -- cgit v1.2.3 From a94ea20f0a7e639dd1a37e8b7c741a3b022049fc Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:55:39 +0200 Subject: Revert "move script to bin" This reverts commit e2354a8edecf781f34ad2979e975e739534cda77. --- users/gkleen@hel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index 159ad9d9..fb65e343 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix @@ -14,7 +14,7 @@ ln -s $out/bin/gpg2 $out/bin/gpg ''; }); - gnupg-daemon = with pkgs; writeScriptBin "gnupg-daemon" '' + gnupg-script = with pkgs; writeScript "gnupg-script" '' #!${stdenv.shell} while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done -- cgit v1.2.3 From 10e18e2b8d96d2742d070a652ee2aa656e8b0780 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:55:43 +0200 Subject: Revert "move scripting to own derivation" This reverts commit a17c9c5dcb9c958683ab571ec1261ce459217569. --- users/gkleen@hel.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index fb65e343..fa4989e2 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix @@ -10,18 +10,16 @@ ''; }; gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { + buildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/gpg \ + --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" \ + --run "systemctl --user import-environment DISPLAY" + ''; postInstall = '' ln -s $out/bin/gpg2 $out/bin/gpg ''; }); - gnupg-script = with pkgs; writeScript "gnupg-script" '' - #!${stdenv.shell} - - while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done - - systemctl --user import-environment DISPLAY - exec ${gnupg}/bin/gpg2 --daemon - ''; } // (import ../utils/nix/default.nix) {}; allowUnfree = true; -- cgit v1.2.3 From 9cdc0f09aec325f79d77265ffeba01c17f7c4b88 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:55:44 +0200 Subject: Revert "needs makeWrapper" This reverts commit 8d62b019f19ca07f416f2aed368c6d4a94ec5a6f. --- users/gkleen@hel.nix | 4 +--- 1 file changed, 1 insertion(+), 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 @@ ''; }; gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { - buildInputs = [ pkgs.makeWrapper ]; postBuild = '' wrapProgram $out/bin/gpg \ - --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" \ - --run "systemctl --user import-environment DISPLAY" + --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" ''; postInstall = '' ln -s $out/bin/gpg2 $out/bin/gpg -- cgit v1.2.3 From f05e7cc2522d2e3ae6be4e751ec2f0237cc2ba7c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 23 Sep 2016 15:55:45 +0200 Subject: Revert "gnupg always needs X" This reverts commit 8d7cd6064d90cb4ed7682d0b68dbcd92576d832f. --- users/gkleen@hel.nix | 6 +----- 1 file changed, 1 insertion(+), 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 @@ ''; }; gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: { - postBuild = '' - wrapProgram $out/bin/gpg \ - --run "while ! systemctl --user show-environment | grep -qE '^DISPLAY='; do sleep 1; done" - ''; postInstall = '' ln -s $out/bin/gpg2 $out/bin/gpg ''; @@ -24,7 +20,7 @@ chromium = { enableWideVine = true; - enablePepperFlash = true; + hiDPI = true; }; mpv = { -- cgit v1.2.3