uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
55
pkgs/tools/misc/ckb-next/default.nix
Normal file
55
pkgs/tools/misc/ckb-next/default.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev, stdenv
|
||||
, pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu
|
||||
, withPulseaudio ? stdenv.isLinux, libpulseaudio
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "0.4.4";
|
||||
pname = "ckb-next";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ckb-next";
|
||||
repo = "ckb-next";
|
||||
rev = "v${version}";
|
||||
sha256 = "1fgvh2hsrm8vqbqq9g45skhyyrhhka4d8ngmyldkldak1fgmrvb7";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
qtbase
|
||||
zlib
|
||||
libXdmcp
|
||||
qttools
|
||||
qtx11extras
|
||||
libdbusmenu
|
||||
] ++ lib.optional withPulseaudio libpulseaudio;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DINSTALL_DIR_ANIMATIONS=libexec"
|
||||
"-DUDEV_RULE_DIRECTORY=lib/udev/rules.d"
|
||||
"-DFORCE_INIT_SYSTEM=systemd"
|
||||
"-DDISABLE_UPDATER=1"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./install-dirs.patch
|
||||
(substituteAll {
|
||||
name = "ckb-next-modprobe.patch";
|
||||
src = ./modprobe.patch;
|
||||
inherit kmod;
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Driver and configuration tool for Corsair keyboards and mice";
|
||||
homepage = "https://github.com/ckb-next/ckb-next";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kierdavis ];
|
||||
};
|
||||
}
|
||||
13
pkgs/tools/misc/ckb-next/install-dirs.patch
Normal file
13
pkgs/tools/misc/ckb-next/install-dirs.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
|
||||
index a04b80c..2969b3b 100644
|
||||
--- a/src/daemon/CMakeLists.txt
|
||||
+++ b/src/daemon/CMakeLists.txt
|
||||
@@ -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 "${SYSTEMD_UNIT_INSTALL_DIR}"
|
||||
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system"
|
||||
PERMISSIONS
|
||||
OWNER_READ OWNER_WRITE
|
||||
GROUP_READ
|
||||
26
pkgs/tools/misc/ckb-next/modprobe.patch
Normal file
26
pkgs/tools/misc/ckb-next/modprobe.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
|
||||
index 933e628..c4f97f2 100644
|
||||
--- a/src/daemon/input_linux.c
|
||||
+++ b/src/daemon/input_linux.c
|
||||
@@ -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");
|
||||
return 1;
|
||||
}
|
||||
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
|
||||
index eeadaf8..87de71f 100644
|
||||
--- a/src/gui/mainwindow.cpp
|
||||
+++ b/src/gui/mainwindow.cpp
|
||||
@@ -309,7 +309,7 @@ void MainWindow::updateVersion(){
|
||||
#elif defined(Q_OS_LINUX)
|
||||
if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
|
||||
QProcess modprobe;
|
||||
- modprobe.start("modprobe", QStringList("uinput"));
|
||||
+ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput"));
|
||||
|
||||
if(!modprobe.waitForFinished())
|
||||
qDebug() << "Modprobe error";
|
||||
Loading…
Add table
Add a link
Reference in a new issue