treewide: use sensible pinentry flavor
This commit is contained in:
parent
764d15f59f
commit
a270c43ea1
5 changed files with 13 additions and 6 deletions
|
@ -210,6 +210,7 @@ in {
|
|||
serif = ["Noto Serif"];
|
||||
};
|
||||
|
||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
|
||||
programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";
|
||||
|
||||
# Enable helpful DBus services.
|
||||
|
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
expect
|
||||
which
|
||||
coreutils
|
||||
pinentry.tty
|
||||
pinentry
|
||||
git
|
||||
gnutar
|
||||
procps
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, makeBinaryWrapper
|
||||
, libfido2
|
||||
, dbus
|
||||
, pinentry
|
||||
, pinentry-gnome3
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
|
@ -29,7 +29,7 @@ buildGoModule rec {
|
|||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/goldwarden \
|
||||
--suffix PATH : ${lib.makeBinPath [dbus pinentry]}
|
||||
--suffix PATH : ${lib.makeBinPath [dbus pinentry-gnome3]}
|
||||
|
||||
install -Dm644 $src/resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions
|
||||
'';
|
||||
|
|
|
@ -30374,7 +30374,9 @@ with pkgs;
|
|||
|
||||
bgpq4 = callPackage ../tools/networking/bgpq4 { };
|
||||
|
||||
blackbox = callPackage ../applications/version-management/blackbox { };
|
||||
blackbox = callPackage ../applications/version-management/blackbox {
|
||||
pinentry = pinentry-curses;
|
||||
};
|
||||
|
||||
bleachbit = callPackage ../applications/misc/bleachbit { };
|
||||
|
||||
|
@ -41310,7 +41312,9 @@ with pkgs;
|
|||
|
||||
linkchecker = callPackage ../tools/networking/linkchecker { };
|
||||
|
||||
tomb = callPackage ../os-specific/linux/tomb { };
|
||||
tomb = callPackage ../os-specific/linux/tomb {
|
||||
pinentry = pinentry-curses;
|
||||
};
|
||||
|
||||
sccache = callPackage ../development/tools/misc/sccache { };
|
||||
|
||||
|
|
|
@ -14920,7 +14920,9 @@ self: super: with self; {
|
|||
|
||||
treq = callPackage ../development/python-modules/treq { };
|
||||
|
||||
trezor-agent = callPackage ../development/python-modules/trezor-agent { };
|
||||
trezor-agent = callPackage ../development/python-modules/trezor-agent {
|
||||
pinentry = pkgs.pinentry-curses;
|
||||
};
|
||||
|
||||
trezor = callPackage ../development/python-modules/trezor { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue