From 71257cb3c17e63938e9d20d861803269d2e2f242 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 1 Oct 2026 22:15:14 +0200 Subject: [PATCH] corectrl: 1.5.1 -> 1.5.2 https://gitlab.com/corectrl/corectrl/-/releases/v1.5.2 Only change upstream fixes the polkit issue that we had to patch. Signed-off-by: Sefa Eyeoglu --- .../Always-locate-polkit-with-pkg-config.diff | 14 -------------- pkgs/by-name/co/corectrl/package.nix | 8 ++------ 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff 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 deleted file mode 100644 index b291abb05039..000000000000 --- a/pkgs/by-name/co/corectrl/Always-locate-polkit-with-pkg-config.diff +++ /dev/null @@ -1,14 +0,0 @@ -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 fdeaddbd30ab..7d556ebcc2b2 100644 --- a/pkgs/by-name/co/corectrl/package.nix +++ b/pkgs/by-name/co/corectrl/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corectrl"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; tag = "v${finalAttrs.version}"; - hash = "sha256-NwGrvDqImiyPc3AsL7rMwNG9na+AzZS6NvXQOc6VWHg="; + hash = "sha256-qZIHFSWxxmXCr5tyhEVaAfn25WyMVki2E0VgzOE8O3w="; }; nativeBuildInputs = [ @@ -54,10 +54,6 @@ stdenv.mkDerivation (finalAttrs: { vulkan-tools ]; - patches = [ - ./Always-locate-polkit-with-pkg-config.diff - ]; - cmakeFlags = [ "-DINSTALL_DBUS_FILES_IN_PREFIX=true" "-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions"