Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 21 lines 818 B view raw
1diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt 2index 3fe2ace..2542ea1 100644 3--- a/src/helper/CMakeLists.txt 4+++ b/src/helper/CMakeLists.txt 5@@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1") 6 7 # Find polkit 8 pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) 9-execute_process( 10- COMMAND pkg-config --variable=policydir polkit-gobject-1 11- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT 12- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR 13- OUTPUT_STRIP_TRAILING_WHITESPACE 14-) 15-if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0") 16- message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config") 17-endif() 18+option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory") 19 20 list(APPEND HELPER_COMPILE_DEFINITIONS 21 ELPP_THREAD_SAFE