From 7cebea55354483bdf07545ec0c539f43cd5119cf Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Wed, 23 Oct 2024 14:41:45 +1100 Subject: [PATCH] overlays/corectrl: remove --- overlays/corectrl.nix | 16 ---------------- overlays/default.nix | 1 - overlays/patches/corectrl.patch | 21 --------------------- 3 files changed, 38 deletions(-) delete mode 100644 overlays/corectrl.nix delete mode 100644 overlays/patches/corectrl.patch diff --git a/overlays/corectrl.nix b/overlays/corectrl.nix deleted file mode 100644 index 1629a7e..0000000 --- a/overlays/corectrl.nix +++ /dev/null @@ -1,16 +0,0 @@ -self: super: { - # copied from nixpkgs 94d828a5033b688af09b02983aad37ecf529bf3c to fix corectrl build failure on linux 6.6 - # awaiting merge into unstable - - corectrl = super.corectrl.overrideAttrs (old: rec { - version = "1.3.8"; - src = self.fetchFromGitLab { - owner = "corectrl"; - repo = "corectrl"; - rev = "v${version}"; - sha256 = "sha256-lc6yWzJiSzGKMzJIpgOtirJONsh49vXWDWrhLV/erwQ="; - }; - - patches = [ ./patches/corectrl.patch ]; - }); -} diff --git a/overlays/default.nix b/overlays/default.nix index 52e804d..0b46673 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,6 @@ builtins.map (path: import path) [ ./android-studio.nix ./ccache.nix - ./corectrl.nix ./discord.nix ./eww.nix ./material-icons.nix diff --git a/overlays/patches/corectrl.patch b/overlays/patches/corectrl.patch deleted file mode 100644 index beaef3b..0000000 --- a/overlays/patches/corectrl.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