diff --git a/overlays/corectrl.nix b/overlays/corectrl.nix new file mode 100644 index 0000000..1629a7e --- /dev/null +++ b/overlays/corectrl.nix @@ -0,0 +1,16 @@ +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 b906b57..d6c9151 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,7 @@ 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 new file mode 100644 index 0000000..beaef3b --- /dev/null +++ b/overlays/patches/corectrl.patch @@ -0,0 +1,21 @@ +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