git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #145643 from SuperSandro2000/pinentry

pinentry: remove libcap null override

commitef42f1da5a0e3f675b7cdfc7239baadd0b14c3a9 authorJörg Thalheim <Mic92@users.noreply.github.com> dateSat 13 Nov 2021, 10:05 (5 years ago) parentabda1f6568dd5c
2 files changed+4−6
compare with master
unifiedsplit
pkgs/tools/security/pinentry/default.nix+3−3 pkgs/top-level/all-packages.nix+1−3
pkgs/tools/security/pinentry/default.nix+3−3
@@ -1,7 +1,6 @@
11{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook
22, libgpg-error, libassuan, qtbase, wrapQtAppsHook
3−, ncurses, gtk2, gcr
4−, libcap ? null, libsecret ? null
3+, ncurses, gtk2, gcr, libcap, libsecret
54, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ]
65 ++ lib.optionals stdenv.isLinux [ "gnome3" ]
76 ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ]
@@ -52,7 +51,8 @@ pinentryMkDerivation rec {
5251
5352 nativeBuildInputs = [ pkg-config autoreconfHook ]
5453 ++ concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors;
55− buildInputs = [ libgpg-error libassuan libcap libsecret ]
54+ buildInputs = [ libgpg-error libassuan libsecret ]
55+ ++ lib.optional (!stdenv.isDarwin) libcap
5656 ++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors;
5757
5858 dontWrapGApps = true;
pkgs/top-level/all-packages.nix+1−3
@@ -8513,9 +8513,7 @@ with pkgs;
85138513
85148514 phosh = callPackage ../applications/window-managers/phosh { };
85158515
8516− pinentry = libsForQt5.callPackage ../tools/security/pinentry {
8517− libcap = if stdenv.isDarwin then null else libcap;
8518− };
8516+ pinentry = libsForQt5.callPackage ../tools/security/pinentry { };
85198517
85208518 pinentry-curses = (lib.getOutput "curses" pinentry);
85218519 pinentry-emacs = (lib.getOutput "emacs" pinentry);