From 6749cba6997353d3f6f30a455b1e3f29dbe4074c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 19 Feb 2022 13:27:36 -0800 Subject: kauth: make polkit dependency optional This patch adds an option enablePolkit to the kauth package, to allow disabling polkit integration. The attr enablePolkit is understood by one other package (tools/networking/connman); using the same name allows to set it globally in ~/.config/nixpkgs/config.nix. --- pkgs/development/libraries/kde-frameworks/kauth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/kde-frameworks') diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 630b51bf46ba6..0333421abd862 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,12 +1,13 @@ { mkDerivation, propagate, extra-cmake-modules, kcoreaddons, polkit-qt, qttools +, enablePolkit ? true }: mkDerivation { name = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkit-qt qttools ]; + buildInputs = (if enablePolkit then [ polkit-qt ] else []) ++ [ qttools ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ ./cmake-install-paths.patch -- cgit 1.4.1 From 54410abf5db94d7e6a0decf145445dbf880af64b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 5 Mar 2022 18:23:33 -0800 Subject: SQUASH_BEFORE_MERGE: apply @Artturin's recommendation https://github.com/NixOS/nixpkgs/pull/160972#r820163675 --- pkgs/development/libraries/kde-frameworks/kauth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/kde-frameworks') diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 0333421abd862..669b02ca39d8b 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,7 +1,8 @@ { mkDerivation, propagate, - extra-cmake-modules, kcoreaddons, polkit-qt, qttools + extra-cmake-modules, kcoreaddons, qttools , enablePolkit ? true +, polkit-qt }: mkDerivation { -- cgit 1.4.1 From 253509dfe5fd07a4a1e0294e09d7a3b0d9d3598d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 24 Mar 2022 09:48:17 -0500 Subject: kauth: use lib.optional --- pkgs/development/libraries/kde-frameworks/kauth/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/kde-frameworks') diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 669b02ca39d8b..05e562511a1f6 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,14 +1,13 @@ { - mkDerivation, propagate, - extra-cmake-modules, kcoreaddons, qttools -, enablePolkit ? true -, polkit-qt + lib, mkDerivation, propagate, + extra-cmake-modules, kcoreaddons, qttools, + enablePolkit ? true, polkit-qt }: mkDerivation { name = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = (if enablePolkit then [ polkit-qt ] else []) ++ [ qttools ]; + buildInputs = [ qttools ] ++ lib.optional enablePolkit polkit-qt; propagatedBuildInputs = [ kcoreaddons ]; patches = [ ./cmake-install-paths.patch -- cgit 1.4.1 From ce9f00278ae7ac9534192c211073932d641f652f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 24 Mar 2022 11:32:12 -0500 Subject: kauth: preserve buildInputs order --- pkgs/development/libraries/kde-frameworks/kauth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/kde-frameworks') diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 05e562511a1f6..93c81525a1483 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -7,7 +7,7 @@ mkDerivation { name = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools ] ++ lib.optional enablePolkit polkit-qt; + buildInputs = lib.optional enablePolkit polkit-qt ++ [ qttools ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ ./cmake-install-paths.patch -- cgit 1.4.1