diff options
| author | kat witch <kat@kittywit.ch> | 2021-04-22 23:56:40 +0100 |
|---|---|---|
| committer | kat witch <kat@kittywit.ch> | 2021-04-22 23:56:40 +0100 |
| commit | 968885ec4a6bdef15eea7fc1bde146fb16525822 (patch) | |
| tree | 7cec8d40668a74e75b46b0292d455f2d7320e7d1 /pkgs/tools/misc/ckb-next | |
| parent | abb55ca1315f9a0dce5e3bce73d6e23e37f8b23a (diff) | |
| download | nixpkgs-968885ec4a6bdef15eea7fc1bde146fb16525822.tar nixpkgs-968885ec4a6bdef15eea7fc1bde146fb16525822.tar.gz nixpkgs-968885ec4a6bdef15eea7fc1bde146fb16525822.tar.bz2 nixpkgs-968885ec4a6bdef15eea7fc1bde146fb16525822.tar.lz nixpkgs-968885ec4a6bdef15eea7fc1bde146fb16525822.tar.xz nixpkgs-968885ec4a6bdef15eea7fc1bde146fb16525822.tar.zst nixpkgs-968885ec4a6bdef15eea7fc1bde146fb16525822.zip | |
ckb-next: 0.4.2 -> 0.4.4
Diffstat (limited to 'pkgs/tools/misc/ckb-next')
| -rw-r--r-- | pkgs/tools/misc/ckb-next/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/misc/ckb-next/install-dirs.patch | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/ckb-next/modprobe.patch | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 9c6909d445d..81e51bbbf20 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,21 +1,25 @@ { lib, mkDerivation, fetchFromGitHub, substituteAll, udev -, pkg-config, qtbase, cmake, zlib, kmod }: +, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu }: mkDerivation rec { - version = "0.4.2"; + version = "0.4.4"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - sha256 = "1mkx1psw5xnpscdfik1kpzsnfhhkn3571i7acr9gxyjr27sckplc"; + sha256 = "1fgvh2hsrm8vqbqq9g45skhyyrhhka4d8ngmyldkldak1fgmrvb7"; }; buildInputs = [ udev qtbase zlib + libXdmcp + qttools + qtx11extras + libdbusmenu ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ckb-next/install-dirs.patch b/pkgs/tools/misc/ckb-next/install-dirs.patch index 0f113d71aa3..05a661c7ffc 100644 --- a/pkgs/tools/misc/ckb-next/install-dirs.patch +++ b/pkgs/tools/misc/ckb-next/install-dirs.patch @@ -1,12 +1,12 @@ diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt -index 2fc10a8..22dbd14 100644 +index a04b80c..2969b3b 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt -@@ -421,7 +421,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd") +@@ -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 "/usr/lib/systemd/system" +- DESTINATION "${SYSTEMD_UNIT_INSTALL_DIR}" + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" PERMISSIONS OWNER_READ OWNER_WRITE diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/pkgs/tools/misc/ckb-next/modprobe.patch index a2cbe262e89..257683e11f6 100644 --- a/pkgs/tools/misc/ckb-next/modprobe.patch +++ b/pkgs/tools/misc/ckb-next/modprobe.patch @@ -1,21 +1,21 @@ diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c -index 8489f5b..b851419 100644 +index 933e628..c4f97f2 100644 --- a/src/daemon/input_linux.c +++ b/src/daemon/input_linux.c -@@ -63,7 +63,7 @@ int os_inputopen(usbdevice* kb){ +@@ -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\n"); + ckb_fatal("Failed to load uinput module"); return 1; } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp -index 1eb95bd..f7d38ba 100644 +index eeadaf8..87de71f 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp -@@ -284,7 +284,7 @@ void MainWindow::updateVersion(){ +@@ -309,7 +309,7 @@ void MainWindow::updateVersion(){ #elif defined(Q_OS_LINUX) if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){ QProcess modprobe; |