diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-11-12 16:49:31 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-11-12 16:49:31 +0100 |
| commit | 568dd5cfa793ce0c3a5cde9b558b1cbacfe32437 (patch) | |
| tree | 3c4e9b4e0945d3b6b0ad5e00fbae8df259ae4635 /pkgs/tools/security/pinentry | |
| parent | db93862a2c777135e0af3e9c7b0bbcba642c8343 (diff) | |
pinentry: remove libcap null override
Diffstat (limited to 'pkgs/tools/security/pinentry')
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 4f6ddae304422..f34acafc9fe94 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -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; |