pyrox.dev
lol
Merge pull request #201175 from fpletz/pkg/pinentry-1.2.1
+5
-6
+5
-6
pkgs/tools/security/pinentry/default.nix
+5
-6
pkgs/tools/security/pinentry/default.nix
···
1
1
{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook
2
2
, libgpg-error, libassuan, qtbase, wrapQtAppsHook
3
-
, ncurses, gtk2, gcr, libcap
3
+
, ncurses, gtk2, gcr
4
4
, withLibsecret ? true, libsecret
5
5
, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ]
6
6
++ lib.optionals stdenv.isLinux [ "gnome3" ]
···
35
35
36
36
pinentryMkDerivation rec {
37
37
pname = "pinentry";
38
-
version = "1.2.0";
38
+
version = "1.2.1";
39
39
40
40
src = fetchurl {
41
41
url = "mirror://gnupg/pinentry/${pname}-${version}.tar.bz2";
42
-
sha256 = "sha256-EAcgRaPgQ9BYH5HNVnb8rH/+6VehZjat7apPWDphZHA=";
42
+
sha256 = "sha256-RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc=";
43
43
};
44
44
45
45
nativeBuildInputs = [ pkg-config autoreconfHook ]
46
46
++ lib.concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors;
47
+
47
48
buildInputs = [ libgpg-error libassuan ]
48
49
++ lib.optional withLibsecret libsecret
49
-
++ lib.optional (!stdenv.isDarwin) libcap
50
50
++ lib.concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors;
51
51
52
52
dontWrapGApps = true;
···
62
62
];
63
63
64
64
configureFlags = [
65
-
(lib.withFeature (libcap != null) "libcap")
66
-
(lib.enableFeature withLibsecret "libsecret")
65
+
(lib.enableFeature withLibsecret "libsecret")
67
66
] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo));
68
67
69
68
postInstall =