commit ba95e48b67ef3f507ec06dd69a7a3dec34e47722
parent c69b487b378eee461e4603ddfa8f28de9908da78
Author: Toni Brown <tb148@proton.me>
Date: Tue, 26 Aug 2025 01:37:37 +0800
use symlinkJoin to make package
Diffstat:
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/gpg-from-sq.nix b/gpg-from-sq.nix
@@ -1,20 +0,0 @@
-{
- stdenv,
- gnupg,
- sequoia-chameleon-gnupg,
-}:
-stdenv.mkDerivation {
- name = "gnupg-from-sequoia";
- buildInputs = [
- gnupg
- sequoia-chameleon-gnupg
- ];
- dontUnpack = true;
- installPhase = ''
- mkdir -p $out/bin
- cp -rT ${gnupg} $out
- rm $out/bin/gpg $out/bin/gpgv
- ln -s ${sequoia-chameleon-gnupg}/bin/gpg-sq $out/bin/gpg
- ln -s ${sequoia-chameleon-gnupg}/bin/gpgv-sq $out/bin/gpgv
- '';
-}
diff --git a/home.nix b/home.nix
@@ -58,7 +58,21 @@
programs.git.signing.key = "53187AD414FDFBCC";
programs.gpg.enable = true;
- programs.gpg.package = pkgs.callPackage ./gpg-from-sq.nix { };
+ programs.gpg.package =
+ with pkgs;
+ symlinkJoin {
+ name = "gnupg-from-sequoia";
+ paths = [
+ gnupg
+ sequoia-chameleon-gnupg
+ ];
+ postBuild = ''
+ mv $out/bin/gpg $out/bin/gpg-g10code
+ mv $out/bin/gpgv $out/bin/gpgv-g10code
+ cp -P $out/bin/gpg-sq $out/bin/gpg
+ cp -P $out/bin/gpgv-sq $out/bin/gpgv
+ '';
+ };
services.gpg-agent = {
enable = true;
enableSshSupport = true;