diff options
author | K900 <me@0upti.me> | 2022-10-22 17:45:51 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2022-10-22 17:45:51 +0300 |
commit | 729d0cf1e05dfdcc1e1b45d02a2516da3594cdc4 (patch) | |
tree | 61c46a73ccde2b9bdb35aa83a61bf61ca226636e /pkgs | |
parent | 95aeaf83c247b8f5aa561684317ecd860476fcd6 (diff) | |
download | nixpkgs-729d0cf1e05dfdcc1e1b45d02a2516da3594cdc4.tar nixpkgs-729d0cf1e05dfdcc1e1b45d02a2516da3594cdc4.tar.gz nixpkgs-729d0cf1e05dfdcc1e1b45d02a2516da3594cdc4.tar.bz2 nixpkgs-729d0cf1e05dfdcc1e1b45d02a2516da3594cdc4.tar.lz nixpkgs-729d0cf1e05dfdcc1e1b45d02a2516da3594cdc4.tar.xz nixpkgs-729d0cf1e05dfdcc1e1b45d02a2516da3594cdc4.tar.zst nixpkgs-729d0cf1e05dfdcc1e1b45d02a2516da3594cdc4.zip |
corectrl: 1.2.7 -> 1.3.1
Also fixes build after the staging merge.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/corectrl/default.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/misc/corectrl/polkit-dir.patch | 21 |
2 files changed, 35 insertions, 3 deletions
diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 67e819ef995..8cf8ddada56 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -7,6 +7,7 @@ , libdrm , hwdata , glxinfo +, polkit , procps , util-linux , vulkan-tools @@ -16,19 +17,23 @@ , qtsvg , qttools , qtxmlpatterns +, quazip , wrapQtAppsHook } : stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.2.7"; + version = "1.3.1"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-X+S+k9LuZveNOV3X7fulsnk9GfGO1czWEvU41q9/cJI="; + sha256 = "sha256-mVMyXpNhwljxsAvrKeHPxUSfdF/mfxG157T13Kb8PnE="; }; + patches = [ + ./polkit-dir.patch + ]; nativeBuildInputs = [ extra-cmake-modules @@ -40,6 +45,7 @@ stdenv.mkDerivation rec{ kauth libdrm glxinfo + polkit procps util-linux vulkan-tools @@ -49,9 +55,14 @@ stdenv.mkDerivation rec{ qtsvg qttools qtxmlpatterns + quazip ]; - cmakeFlags = [ "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" ]; + cmakeFlags = [ + "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" + "-DINSTALL_DBUS_FILES_IN_PREFIX=true" + "-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions" + ]; runtimeDeps = [ hwdata glxinfo vulkan-tools util-linux procps ]; binPath = lib.makeBinPath runtimeDeps; diff --git a/pkgs/applications/misc/corectrl/polkit-dir.patch b/pkgs/applications/misc/corectrl/polkit-dir.patch new file mode 100644 index 00000000000..85b0f765beb --- /dev/null +++ b/pkgs/applications/misc/corectrl/polkit-dir.patch @@ -0,0 +1,21 @@ +diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt +index 1b7ed7c..757748c 100644 +--- a/src/helper/CMakeLists.txt ++++ b/src/helper/CMakeLists.txt +@@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1") + + # Find polkit + 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 +- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR +- OUTPUT_STRIP_TRAILING_WHITESPACE +-) +-if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0") +- message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config") +-endif() ++option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory") + + list(APPEND PROCESS_MONITOR_SRC + pmon/processmonitor.cpp |