diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2022-11-14 12:53:16 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-16 21:01:15 +0100 |
| commit | 1e30bc4aeb78d080c2224d9f0b46724b59b90f92 (patch) | |
| tree | 108428aff2b56bf16b2917146acb5a50b7a675d0 /pkgs | |
| parent | 922556a3d3096a244193757b027af9f9c5ae52b3 (diff) | |
pinentry: 1.2.0 -> 1.2.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 61f84e5d76e93..54c8685f38eb1 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,6 +1,6 @@ { fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook , libgpg-error, libassuan, qtbase, wrapQtAppsHook -, ncurses, gtk2, gcr, libcap +, ncurses, gtk2, gcr , withLibsecret ? true, libsecret , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] @@ -35,18 +35,18 @@ in pinentryMkDerivation rec { pname = "pinentry"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "mirror://gnupg/pinentry/${pname}-${version}.tar.bz2"; - sha256 = "sha256-EAcgRaPgQ9BYH5HNVnb8rH/+6VehZjat7apPWDphZHA="; + sha256 = "sha256-RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ++ lib.concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; + buildInputs = [ libgpg-error libassuan ] ++ lib.optional withLibsecret libsecret - ++ lib.optional (!stdenv.isDarwin) libcap ++ lib.concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; dontWrapGApps = true; @@ -62,8 +62,7 @@ pinentryMkDerivation rec { ]; configureFlags = [ - (lib.withFeature (libcap != null) "libcap") - (lib.enableFeature withLibsecret "libsecret") + (lib.enableFeature withLibsecret "libsecret") ] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo)); postInstall = |