Merge pull request #33287 from Nadrieril/fix-ckb-service

ckb: fix missing modprobe dependency
This commit is contained in:
Michael Raskin 2018-01-22 21:18:22 +00:00 committed by GitHub
commit 9593eadcc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions

View file

@ -0,0 +1,13 @@
diff --git a/src/ckb-daemon/usb_linux.c b/src/ckb-daemon/usb_linux.c
index 8673f86..4714305 100644
--- a/src/ckb-daemon/usb_linux.c
+++ b/src/ckb-daemon/usb_linux.c
@@ -440,7 +440,7 @@ static void udev_enum(){
int usbmain(){
// Load the uinput module (if it's not loaded already)
- if(system("modprobe uinput") != 0)
+ if(system("@kmod@/bin/modprobe uinput") != 0)
ckb_warn("Failed to load uinput module\n");
// Create the udev object

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }:
{ stdenv, fetchFromGitHub, substituteAll, libudev, pkgconfig, qtbase, qmake, zlib, kmod }:
stdenv.mkDerivation rec {
version = "0.2.8";
@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
patches = [
./ckb-animations-location.patch
(substituteAll {
name = "ckb-modprobe.patch";
src = ./ckb-modprobe.patch;
inherit kmod;
})
];
doCheck = false;