treewide: use sensible pinentry flavor

authored by Franz Pletz and committed by Sandro Jäckel a270c43e 764d15f5

+13 -6
+1
nixos/modules/services/x11/desktop-managers/plasma6.nix
··· 210 210 serif = ["Noto Serif"]; 211 211 }; 212 212 213 + programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt; 213 214 programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass"; 214 215 215 216 # Enable helpful DBus services.
+1 -1
pkgs/applications/version-management/blackbox/default.nix
··· 31 31 expect 32 32 which 33 33 coreutils 34 - pinentry.tty 34 + pinentry 35 35 git 36 36 gnutar 37 37 procps
+2 -2
pkgs/by-name/go/goldwarden/package.nix
··· 4 4 , makeBinaryWrapper 5 5 , libfido2 6 6 , dbus 7 - , pinentry 7 + , pinentry-gnome3 8 8 , nix-update-script 9 9 }: 10 10 ··· 29 29 30 30 postInstall = '' 31 31 wrapProgram $out/bin/goldwarden \ 32 - --suffix PATH : ${lib.makeBinPath [dbus pinentry]} 32 + --suffix PATH : ${lib.makeBinPath [dbus pinentry-gnome3]} 33 33 34 34 install -Dm644 $src/resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions 35 35 '';
+6 -2
pkgs/top-level/all-packages.nix
··· 30374 30374 30375 30375 bgpq4 = callPackage ../tools/networking/bgpq4 { }; 30376 30376 30377 - blackbox = callPackage ../applications/version-management/blackbox { }; 30377 + blackbox = callPackage ../applications/version-management/blackbox { 30378 + pinentry = pinentry-curses; 30379 + }; 30378 30380 30379 30381 bleachbit = callPackage ../applications/misc/bleachbit { }; 30380 30382 ··· 41310 41312 41311 41313 linkchecker = callPackage ../tools/networking/linkchecker { }; 41312 41314 41313 - tomb = callPackage ../os-specific/linux/tomb { }; 41315 + tomb = callPackage ../os-specific/linux/tomb { 41316 + pinentry = pinentry-curses; 41317 + }; 41314 41318 41315 41319 sccache = callPackage ../development/tools/misc/sccache { }; 41316 41320
+3 -1
pkgs/top-level/python-packages.nix
··· 14920 14920 14921 14921 treq = callPackage ../development/python-modules/treq { }; 14922 14922 14923 - trezor-agent = callPackage ../development/python-modules/trezor-agent { }; 14923 + trezor-agent = callPackage ../development/python-modules/trezor-agent { 14924 + pinentry = pkgs.pinentry-curses; 14925 + }; 14924 14926 14925 14927 trezor = callPackage ../development/python-modules/trezor { }; 14926 14928