move scripting to own derivation

1 files 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;