From 5f7fd26d5a99f2447f4e8734913fbc83a98955f2 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Mon, 5 May 2025 13:24:30 -0500
Subject: [PATCH] corectrl: 1.4.3 -> 1.5.1

---
 .../Always-locate-polkit-with-pkg-config.diff | 14 ++++++++
 pkgs/by-name/co/corectrl/package.nix          | 35 ++++++++++---------
 pkgs/by-name/co/corectrl/polkit-dir.patch     | 21 -----------
 3 files changed, 32 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff
 delete mode 100644 pkgs/by-name/co/corectrl/polkit-dir.patch

diff --git a/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff b/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff
new file mode 100644
index 000000000000..b291abb05039
--- /dev/null
+++ b/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff
@@ -0,0 +1,14 @@
+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
diff --git a/pkgs/by-name/co/corectrl/package.nix b/pkgs/by-name/co/corectrl/package.nix
index 3a8d2851b8be..33dcafd2cf21 100644
--- a/pkgs/by-name/co/corectrl/package.nix
+++ b/pkgs/by-name/co/corectrl/package.nix
@@ -1,11 +1,12 @@
 {
   botan3,
-  extra-cmake-modules,
   fetchFromGitLab,
+  cmake,
+  pkg-config,
   hwdata,
   lib,
   libdrm,
-  libsForQt5,
+  kdePackages,
   mesa-demos,
   polkit,
   procps,
@@ -18,32 +19,32 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "corectrl";
-  version = "1.4.3";
+  version = "1.5.1";
 
   src = fetchFromGitLab {
     owner = "corectrl";
     repo = "corectrl";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-rQibIjLmSnkA8jk6GOo68JIeb4wZq0wxXpLs3zsB7GI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NwGrvDqImiyPc3AsL7rMwNG9na+AzZS6NvXQOc6VWHg=";
   };
 
   nativeBuildInputs = [
-    extra-cmake-modules
-    libsForQt5.wrapQtAppsHook
+    cmake
+    pkg-config
+    kdePackages.extra-cmake-modules
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
     botan3
     libdrm # TODO: report upstream that libdrm is not detected at configure time
-    libsForQt5.karchive
-    libsForQt5.kauth
-    libsForQt5.qtbase
-    libsForQt5.qtcharts
-    libsForQt5.qtquickcontrols2
-    libsForQt5.qtsvg
-    libsForQt5.qttools
-    libsForQt5.qtxmlpatterns
-    libsForQt5.quazip
+    kdePackages.karchive
+    kdePackages.kauth
+    kdePackages.qtbase
+    kdePackages.qtcharts
+    kdePackages.qtsvg
+    kdePackages.qttools
+    kdePackages.quazip
     mesa-demos
     polkit
     procps
@@ -54,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    ./polkit-dir.patch
+    ./Always-locate-polkit-with-pkg-config.diff
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/co/corectrl/polkit-dir.patch b/pkgs/by-name/co/corectrl/polkit-dir.patch
deleted file mode 100644
index beaef3b5097e..000000000000
--- a/pkgs/by-name/co/corectrl/polkit-dir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
-index 3fe2ace..2542ea1 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 HELPER_COMPILE_DEFINITIONS
-   ELPP_THREAD_SAFE