diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/libraries/kde-frameworks | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kde-frameworks')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 630b51bf46ba..93c81525a148 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,12 +1,13 @@ { - mkDerivation, propagate, - extra-cmake-modules, kcoreaddons, polkit-qt, qttools + lib, mkDerivation, propagate, + extra-cmake-modules, kcoreaddons, qttools, + enablePolkit ? true, polkit-qt }: mkDerivation { name = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkit-qt qttools ]; + buildInputs = lib.optional enablePolkit polkit-qt ++ [ qttools ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ ./cmake-install-paths.patch |