push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,83 @@
{
lib,
wrapQtAppsHook,
fetchFromGitHub,
replaceVars,
udev,
stdenv,
pkg-config,
qtbase,
cmake,
zlib,
kmod,
libXdmcp,
qttools,
qtx11extras,
libdbusmenu,
gnused,
withPulseaudio ? stdenv.hostPlatform.isLinux,
libpulseaudio,
quazip,
udevCheckHook,
}:
stdenv.mkDerivation rec {
version = "0.6.2";
pname = "ckb-next";
src = fetchFromGitHub {
owner = "ckb-next";
repo = "ckb-next";
rev = "v${version}";
hash = "sha256-lA1FpUee2SpUQwJotbYhG0QX7LT5l2PP9lJ9F3uNtdU=";
};
buildInputs = [
udev
qtbase
zlib
libXdmcp
qttools
qtx11extras
libdbusmenu
quazip
]
++ lib.optional withPulseaudio libpulseaudio;
nativeBuildInputs = [
wrapQtAppsHook
pkg-config
cmake
udevCheckHook
];
cmakeFlags = [
"-DINSTALL_DIR_ANIMATIONS=libexec"
"-DUDEV_RULE_DIRECTORY=lib/udev/rules.d"
"-DFORCE_INIT_SYSTEM=systemd"
"-DDISABLE_UPDATER=1"
];
patches = [
./install-dirs.patch
(replaceVars ./modprobe.patch {
inherit kmod;
})
];
doInstallCheck = true;
postInstall = ''
substituteInPlace "$out/lib/udev/rules.d/99-ckb-next-daemon.rules" \
--replace-fail "/usr/bin/env sed" "${lib.getExe gnused}"
'';
meta = with lib; {
description = "Driver and configuration tool for Corsair keyboards and mice";
homepage = "https://github.com/ckb-next/ckb-next";
license = licenses.gpl2Only;
platforms = platforms.linux;
mainProgram = "ckb-next";
maintainers = [ ];
};
}

View File

@@ -0,0 +1,13 @@
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index a04b80c..2969b3b 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -437,7 +437,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd")
elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service"
- DESTINATION "${SYSTEMD_UNIT_INSTALL_DIR}"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system"
PERMISSIONS
OWNER_READ OWNER_WRITE
GROUP_READ

View File

@@ -0,0 +1,26 @@
diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
index 933e628..c4f97f2 100644
--- a/src/daemon/input_linux.c
+++ b/src/daemon/input_linux.c
@@ -70,7 +70,7 @@ int os_inputopen(usbdevice* kb){
// If not available, load the module
if(fd < 0){
- if(system("modprobe uinput") != 0) {
+ if(system("@kmod@/bin/modprobe uinput") != 0) {
ckb_fatal("Failed to load uinput module");
return 1;
}
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index eeadaf8..87de71f 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -309,7 +309,7 @@ void MainWindow::updateVersion(){
#elif defined(Q_OS_LINUX)
if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
QProcess modprobe;
- modprobe.start("modprobe", QStringList("uinput"));
+ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput"));
if(!modprobe.waitForFinished())
qDebug() << "Modprobe error";