summary refs log tree commit diff
path: root/pkgs/tools/misc/ckb-next/modprobe.patch
diff options
context:
space:
mode:
authorKier Davis <kierdavis@gmail.com>2018-05-06 19:49:51 +0100
committerKier Davis <kierdavis@gmail.com>2018-10-22 13:23:30 +0100
commit7a0d8496537a8b31a0697a8d08fa042837fb467c (patch)
tree0d30c2495e7caf2da07e76b258ff342d33399534 /pkgs/tools/misc/ckb-next/modprobe.patch
parentdfdaf39ec3b5995e85c3783eb878b60aed893b62 (diff)
downloadnixpkgs-7a0d8496537a8b31a0697a8d08fa042837fb467c.tar
nixpkgs-7a0d8496537a8b31a0697a8d08fa042837fb467c.tar.gz
nixpkgs-7a0d8496537a8b31a0697a8d08fa042837fb467c.tar.bz2
nixpkgs-7a0d8496537a8b31a0697a8d08fa042837fb467c.tar.lz
nixpkgs-7a0d8496537a8b31a0697a8d08fa042837fb467c.tar.xz
nixpkgs-7a0d8496537a8b31a0697a8d08fa042837fb467c.tar.zst
nixpkgs-7a0d8496537a8b31a0697a8d08fa042837fb467c.zip
ckb-next: rename ckb-modprobe.patch to modprobe.patch
This keeps the naming consistent with the other two patches in
this directory.
Diffstat (limited to 'pkgs/tools/misc/ckb-next/modprobe.patch')
-rw-r--r--pkgs/tools/misc/ckb-next/modprobe.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/pkgs/tools/misc/ckb-next/modprobe.patch
new file mode 100644
index 00000000000..f2156fc3b23
--- /dev/null
+++ b/pkgs/tools/misc/ckb-next/modprobe.patch
@@ -0,0 +1,26 @@
+diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
+index 1cedb07..8e0b24b 100644
+--- a/src/daemon/input_linux.c
++++ b/src/daemon/input_linux.c
+@@ -58,7 +58,7 @@ int os_inputopen(usbdevice* kb){
+     /// First check whether the uinput module is loaded by the kernel.
+     ///
+     // Load the uinput module (if it's not loaded already)
+-    if(system("modprobe uinput") != 0) {
++    if(system("@kmod@/bin/modprobe uinput") != 0) {
+         ckb_fatal("Failed to load uinput module\n");
+         return 1;
+     }
+diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
+index 3601146..3f2f78f 100644
+--- a/src/gui/mainwindow.cpp
++++ b/src/gui/mainwindow.cpp
+@@ -251,7 +251,7 @@ void MainWindow::updateVersion(){
+             daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices."));
+ #elif defined(Q_OS_LINUX)
+             QProcess modprobe;
+-            modprobe.start("modprobe", QStringList("uinput"));
++            modprobe.start("@kmod@/bin/modprobe", QStringList("uinput"));
+ 
+             if(!modprobe.waitForFinished())
+                 qDebug() << "Modprobe error";