pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #145643 from SuperSandro2000/pinentry

pinentry: remove libcap null override

authored by Jörg Thalheim and committed by GitHub ef42f1da abda1f6e

+4 -6
unified split
+3 -3
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 4 - , libcap ? null, libsecret ? null 3 + , ncurses, gtk2, gcr, libcap, libsecret 5 4 , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] 6 5 ++ lib.optionals stdenv.isLinux [ "gnome3" ] 7 6 ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ] ··· 52 51 53 52 nativeBuildInputs = [ pkg-config autoreconfHook ] 54 53 ++ 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 56 56 ++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; 57 57 58 58 dontWrapGApps = true;
+1 -3
pkgs/top-level/all-packages.nix
··· 8513 8513 8514 8514 phosh = callPackage ../applications/window-managers/phosh { }; 8515 8515 8516 - pinentry = libsForQt5.callPackage ../tools/security/pinentry { 8517 - libcap = if stdenv.isDarwin then null else libcap; 8518 - }; 8516 + pinentry = libsForQt5.callPackage ../tools/security/pinentry { }; 8519 8517 8520 8518 pinentry-curses = (lib.getOutput "curses" pinentry); 8521 8519 pinentry-emacs = (lib.getOutput "emacs" pinentry);