BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: use sensible pinentry flavor

Browse source
This commit is contained in:
Franz Pletz 2021-08-11 22:17:41 +02:00 committed by Sandro Jäckel
parent 764d15f59f
commit a270c43ea1
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/plasma6.nix
View file

@ -210,6 +210,7 @@ in {
serif = ["Noto Serif"]; serif = ["Noto Serif"];
}; };
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass"; programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services. # Enable helpful DBus services.

2
pkgs/applications/version-management/blackbox/default.nix
View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
expect expect
which which
coreutils coreutils
pinentry.tty pinentry
git git
gnutar gnutar
procps procps

4
pkgs/by-name/go/goldwarden/package.nix
View file

@ -4,7 +4,7 @@
, makeBinaryWrapper , makeBinaryWrapper
, libfido2 , libfido2
, dbus , dbus
, pinentry , pinentry-gnome3
, nix-update-script , nix-update-script
}: }:
@ -29,7 +29,7 @@ buildGoModule rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/goldwarden \ 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 install -Dm644 $src/resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions
''; '';

8
pkgs/top-level/all-packages.nix
View file

@ -30374,7 +30374,9 @@ with pkgs;
bgpq4 = callPackage ../tools/networking/bgpq4 { }; 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 { }; bleachbit = callPackage ../applications/misc/bleachbit { };
@ -41310,7 +41312,9 @@ with pkgs;
linkchecker = callPackage ../tools/networking/linkchecker { }; 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 { }; sccache = callPackage ../development/tools/misc/sccache { };

4
pkgs/top-level/python-packages.nix
View file

@ -14920,7 +14920,9 @@ self: super: with self; {
treq = callPackage ../development/python-modules/treq { }; 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 { }; trezor = callPackage ../development/python-modules/trezor { };