diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-01-22 21:18:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 21:18:22 +0000 |
| commit | 9593eadcc75f3999a4cb336190ae3aacee7e5ba1 (patch) | |
| tree | 45439e506ad823f4823984e592264aa07706abd7 /pkgs | |
| parent | ec0c4802ae89dccfbff1060fd411b46113e87671 (diff) | |
| parent | a3252955d90e15362b9d0bcf297a588adc2b3a72 (diff) | |
| download | nixlib-9593eadcc75f3999a4cb336190ae3aacee7e5ba1.tar nixlib-9593eadcc75f3999a4cb336190ae3aacee7e5ba1.tar.gz nixlib-9593eadcc75f3999a4cb336190ae3aacee7e5ba1.tar.bz2 nixlib-9593eadcc75f3999a4cb336190ae3aacee7e5ba1.tar.lz nixlib-9593eadcc75f3999a4cb336190ae3aacee7e5ba1.tar.xz nixlib-9593eadcc75f3999a4cb336190ae3aacee7e5ba1.tar.zst nixlib-9593eadcc75f3999a4cb336190ae3aacee7e5ba1.zip | |
Merge pull request #33287 from Nadrieril/fix-ckb-service
ckb: fix missing modprobe dependency
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/ckb/ckb-modprobe.patch | 13 | ||||
| -rw-r--r-- | pkgs/tools/misc/ckb/default.nix | 7 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/tools/misc/ckb/ckb-modprobe.patch b/pkgs/tools/misc/ckb/ckb-modprobe.patch new file mode 100644 index 000000000000..8024151159cf --- /dev/null +++ b/pkgs/tools/misc/ckb/ckb-modprobe.patch @@ -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 diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix index a0dbc6fd4fe9..6ea31f434f23 100644 --- a/pkgs/tools/misc/ckb/default.nix +++ b/pkgs/tools/misc/ckb/default.nix @@ -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; |