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
93
pkgs/os-specific/linux/g15daemon/default.nix
Normal file
93
pkgs/os-specific/linux/g15daemon/default.nix
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, patchelf
|
||||
, freetype
|
||||
, libusb-compat-0_1
|
||||
}:
|
||||
let
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
|
||||
g15src = { pname, version, sha256 }: fetchurl {
|
||||
url = "mirror://sourceforge/g15tools/${pname}/${version}/${pname}-${version}.tar.bz2";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
libg15 = stdenv.mkDerivation rec {
|
||||
pname = "libg15";
|
||||
version = "1.2.7";
|
||||
|
||||
src = g15src {
|
||||
inherit pname version;
|
||||
sha256 = "1mkrf622n0cmz57lj8w9q82a9dcr1lmyyxbnrghrxzb6gvifnbqk";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Provides low-level access to Logitech G11/G15 keyboards and Z10 speakers";
|
||||
inherit license maintainers;
|
||||
};
|
||||
};
|
||||
|
||||
libg15render = stdenv.mkDerivation rec {
|
||||
pname = "libg15render";
|
||||
version = "1.2";
|
||||
|
||||
src = g15src {
|
||||
inherit pname version;
|
||||
sha256 = "03yjb78j1fnr2fwklxy54sdljwi0imvp29m8kmwl9v0pdapka8yj";
|
||||
};
|
||||
|
||||
buildInputs = [ libg15 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A small graphics library optimised for drawing on an LCD";
|
||||
inherit license maintainers;
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "g15daemon";
|
||||
version = "1.9.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/G15Daemon%201.9x/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1613gsp5dgilwbshqxxhiyw73ksngnam7n1iw6yxdjkp9fyd2a3d";
|
||||
};
|
||||
|
||||
patches = let
|
||||
patch = fname: sha256: fetchurl rec {
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/c0b0b6d4d6d7b79eca68123b20e0c9fb82e1c6e1/g15daemon/trunk/${pname}-${version}-${fname}.patch";
|
||||
name = "${fname}.patch";
|
||||
inherit sha256;
|
||||
};
|
||||
in
|
||||
[
|
||||
(patch "uinput" "1misfff7a1vg0qgfk3n25y7drnm86a4gq96iflpcwr5x3lw7q0h7")
|
||||
(patch "config-write" "0jkrbqvzqrvxr14h5qi17cb4d32caq7vw9kzlz3qwpxdgxjrjvy2")
|
||||
(patch "recv-oob-answer" "1f67iqpj5hcgpakagi7gbw1xviwhy5vizs546l9bfjimx8r2d29g")
|
||||
./pid_location.patch
|
||||
];
|
||||
|
||||
buildInputs = [ libg15 libg15render ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream gcc-10:
|
||||
# ld: g15_plugins.o:/build/g15daemon-1.9.5.3/g15daemon/./g15daemon.h:218:
|
||||
# multiple definition of `lcdlist_mutex'; utility_funcs.o:g15daemon.h:218: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A daemon that makes it possible to use the Logitech keyboard G-Buttons and draw on various Logitech LCDs";
|
||||
inherit license maintainers;
|
||||
};
|
||||
}
|
||||
25
pkgs/os-specific/linux/g15daemon/pid_location.patch
Normal file
25
pkgs/os-specific/linux/g15daemon/pid_location.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/g15daemon/main.c b/g15daemon/main.c
|
||||
index e674475..97b8242 100644
|
||||
--- a/g15daemon/main.c
|
||||
+++ b/g15daemon/main.c
|
||||
@@ -574,7 +574,7 @@ exitnow:
|
||||
g15daemon_quit_refresh();
|
||||
uf_conf_write(lcdlist,"/etc/g15daemon.conf");
|
||||
uf_conf_free(lcdlist);
|
||||
- unlink("/var/run/g15daemon.pid");
|
||||
+ unlink("/run/g15daemon/g15daemon.pid");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
diff --git a/g15daemon/utility_funcs.c b/g15daemon/utility_funcs.c
|
||||
index c93d164..2e9c679 100644
|
||||
--- a/g15daemon/utility_funcs.c
|
||||
+++ b/g15daemon/utility_funcs.c
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
extern unsigned int g15daemon_debug;
|
||||
extern volatile int leaving;
|
||||
-#define G15DAEMON_PIDFILE "/var/run/g15daemon.pid"
|
||||
+#define G15DAEMON_PIDFILE "/run/g15daemon/g15daemon.pid"
|
||||
|
||||
pthread_cond_t lcd_refresh = PTHREAD_COND_INITIALIZER;
|
||||
Loading…
Add table
Add a link
Reference in a new issue