alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pinentry: remove libcap null override

Browse source
This commit is contained in:
Sandro Jäckel 2021-11-12 16:49:31 +01:00
parent db93862a2c
commit 568dd5cfa7
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook
, libgpg-error, libassuan, qtbase, wrapQtAppsHook
, ncurses, gtk2, gcr
, libcap ? null, libsecret ? null
, ncurses, gtk2, gcr, libcap, libsecret
, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ]
++ lib.optionals stdenv.isLinux [ "gnome3" ]
++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ]
@ -52,7 +51,8 @@ pinentryMkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ]
++ concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors;
buildInputs = [ libgpg-error libassuan libcap libsecret ]
buildInputs = [ libgpg-error libassuan libsecret ]
++ lib.optional (!stdenv.isDarwin) libcap
++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors;
dontWrapGApps = true;

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

@ -8507,9 +8507,7 @@ with pkgs;
phosh = callPackage ../applications/window-managers/phosh { };
pinentry = libsForQt5.callPackage ../tools/security/pinentry {
libcap = if stdenv.isDarwin then null else libcap;
};
pinentry = libsForQt5.callPackage ../tools/security/pinentry { };
pinentry-curses = (lib.getOutput "curses" pinentry);
pinentry-emacs = (lib.getOutput "emacs" pinentry);