mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-07 13:40:36 +02:00
* gnu/packages/admin.scm (corectrl): Update to 1.5.1 and remove outdated comment. [source] <patches>: Remove corectrl-polkit-install-dir.patch, add corectrl-locate-polkit-with-pkg-config.patch [native-inputs]: Remove qttools-5; add qttools. [inputs]: Remove qtcharts-5, qtdeclarative-5, qtsvg-5, qtwayland-5, quazip-5; Add qtbase, qtcharts, qtdeclarative, qtsvg, qtwayland, quazip, qt5compat. * gnu/packages/patches/corectrl-locate-polkit-with-pkg-config.patch: Add file. * gnu/packages/patches/corectrl-polkit-install-dir.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Register corectrl-locate-polkit-with-pkg-config.patch, de-register corectrl-polkit-install-dir.patch. Change-Id: I4888e05ce67328a5ab269fb3aaac6bdb769ad4c9 Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
17 lines
694 B
Diff
17 lines
694 B
Diff
See https://gitlab.com/corectrl/corectrl/-/issues/493
|
|
|
|
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
|
|
index 38deb12..7bbaa81 100644
|
|
--- a/src/helper/CMakeLists.txt
|
|
+++ b/src/helper/CMakeLists.txt
|
|
@@ -27,8 +27,8 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1")
|
|
option(POLKIT_POLICY_INSTALL_DIR "Polkit policy files installation directory" OFF)
|
|
|
|
# Find polkit
|
|
+pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
|
|
if(NOT POLKIT_POLICY_INSTALL_DIR)
|
|
- pkg_check_modules(POLKIT REQUIRED polkit-gobject-1)
|
|
execute_process(
|
|
COMMAND pkg-config --variable=policydir polkit-gobject-1
|
|
RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT
|