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

Merge pull request #201175 from fpletz/pkg/pinentry-1.2.1

Browse source
This commit is contained in:
Sandro 2022-12-17 00:17:59 +01:00 committed by GitHub
commit 08e1964458
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/security/pinentry/default.nix
View file

@ -1,6 +1,6 @@
{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook { fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook
, libgpg-error, libassuan, qtbase, wrapQtAppsHook , libgpg-error, libassuan, qtbase, wrapQtAppsHook
, ncurses, gtk2, gcr, libcap , ncurses, gtk2, gcr
, withLibsecret ? true, libsecret , withLibsecret ? true, libsecret
, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ]
++ lib.optionals stdenv.isLinux [ "gnome3" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ]
@ -35,18 +35,18 @@ in
pinentryMkDerivation rec { pinentryMkDerivation rec {
pname = "pinentry"; pname = "pinentry";
version = "1.2.0"; version = "1.2.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/pinentry/${pname}-${version}.tar.bz2"; url = "mirror://gnupg/pinentry/${pname}-${version}.tar.bz2";
sha256 = "sha256-EAcgRaPgQ9BYH5HNVnb8rH/+6VehZjat7apPWDphZHA="; sha256 = "sha256-RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc=";
}; };
nativeBuildInputs = [ pkg-config autoreconfHook ] nativeBuildInputs = [ pkg-config autoreconfHook ]
++ lib.concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; ++ lib.concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors;
buildInputs = [ libgpg-error libassuan ] buildInputs = [ libgpg-error libassuan ]
++ lib.optional withLibsecret libsecret ++ lib.optional withLibsecret libsecret
++ lib.optional (!stdenv.isDarwin) libcap
++ lib.concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; ++ lib.concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors;
dontWrapGApps = true; dontWrapGApps = true;
@ -62,7 +62,6 @@ pinentryMkDerivation rec {
]; ];
configureFlags = [ configureFlags = [
(lib.withFeature (libcap != null) "libcap")
(lib.enableFeature withLibsecret "libsecret") (lib.enableFeature withLibsecret "libsecret")
] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo)); ] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo));