public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120277 from kittywitch/ckb-update 

ckb-next: 0.4.2 -> 0.4.4
This commit is contained in:
Sandro 2021-04-23 01:20:04 +02:00 committed by GitHub
parent ccbd83ec20 968885ec4a
commit e9e74016a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/misc/ckb-next/default.nix
View File

@ -1,21 +1,25 @@
{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev { lib, mkDerivation, fetchFromGitHub, substituteAll, udev
, pkg-config, qtbase, cmake, zlib, kmod }: , pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu }:
mkDerivation rec { mkDerivation rec {
version = "0.4.2"; version = "0.4.4";
pname = "ckb-next"; pname = "ckb-next";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ckb-next"; owner = "ckb-next";
repo = "ckb-next"; repo = "ckb-next";
rev = "v${version}"; rev = "v${version}";
sha256 = "1mkx1psw5xnpscdfik1kpzsnfhhkn3571i7acr9gxyjr27sckplc"; sha256 = "1fgvh2hsrm8vqbqq9g45skhyyrhhka4d8ngmyldkldak1fgmrvb7";
}; };
buildInputs = [ buildInputs = [
udev udev
qtbase qtbase
zlib zlib
libXdmcp
qttools
qtx11extras
libdbusmenu
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/tools/misc/ckb-next/install-dirs.patch
View File

@ -1,12 +1,12 @@
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt 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 --- a/src/daemon/CMakeLists.txt
+++ b/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") elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd")
install( install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" 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" + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system"
PERMISSIONS PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_READ OWNER_WRITE

10
pkgs/tools/misc/ckb-next/modprobe.patch
View File

@ -1,21 +1,21 @@
diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c 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 --- a/src/daemon/input_linux.c
+++ b/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 not available, load the module
if(fd < 0){ if(fd < 0){
- if(system("modprobe uinput") != 0) { - if(system("modprobe uinput") != 0) {
+ if(system("@kmod@/bin/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; return 1;
} }
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp 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 --- a/src/gui/mainwindow.cpp
+++ b/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) #elif defined(Q_OS_LINUX)
if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){ if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
QProcess modprobe; QProcess modprobe;