g15daemon: init at 1.9.5.3

+115
+88
pkgs/os-specific/linux/g15daemon/default.nix
··· 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , fetchurl 5 + , fetchpatch 6 + , patchelf 7 + , freetype 8 + , libusb 9 + }: 10 + let 11 + license = lib.licenses.gpl2; 12 + maintainers = with lib.maintainers; [ peterhoeg ]; 13 + 14 + g15src = { pname, version, sha256 }: fetchurl { 15 + url = "mirror://sourceforge/g15tools/${pname}/${version}/${pname}-${version}.tar.bz2"; 16 + inherit sha256; 17 + }; 18 + 19 + libg15 = stdenv.mkDerivation rec { 20 + pname = "libg15"; 21 + version = "1.2.7"; 22 + 23 + src = g15src { 24 + inherit pname version; 25 + sha256 = "1mkrf622n0cmz57lj8w9q82a9dcr1lmyyxbnrghrxzb6gvifnbqk"; 26 + }; 27 + 28 + buildInputs = [ libusb ]; 29 + 30 + enableParallelBuilding = true; 31 + 32 + meta = { 33 + description = "Provides low-level access to Logitech G11/G15 keyboards and Z10 speakers"; 34 + inherit license maintainers; 35 + }; 36 + }; 37 + 38 + libg15render = stdenv.mkDerivation rec { 39 + pname = "libg15render"; 40 + version = "1.2"; 41 + 42 + src = g15src { 43 + inherit pname version; 44 + sha256 = "03yjb78j1fnr2fwklxy54sdljwi0imvp29m8kmwl9v0pdapka8yj"; 45 + }; 46 + 47 + buildInputs = [ libg15 ]; 48 + 49 + enableParallelBuilding = true; 50 + 51 + meta = { 52 + description = "A small graphics library optimised for drawing on an LCD"; 53 + inherit license maintainers; 54 + }; 55 + }; 56 + in 57 + stdenv.mkDerivation rec { 58 + pname = "g15daemon"; 59 + version = "1.9.5.3"; 60 + 61 + src = fetchurl { 62 + url = "mirror://sourceforge/${pname}/G15Daemon%201.9x/${version}/${pname}-${version}.tar.bz2"; 63 + sha256 = "1613gsp5dgilwbshqxxhiyw73ksngnam7n1iw6yxdjkp9fyd2a3d"; 64 + }; 65 + 66 + patches = let 67 + patch = fname: sha256: fetchurl rec { 68 + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/${pname}-${version}-${fname}.patch?h=packages/${pname}"; 69 + name = "${fname}.patch"; 70 + inherit sha256; 71 + }; 72 + in 73 + [ 74 + (patch "uinput" "1misfff7a1vg0qgfk3n25y7drnm86a4gq96iflpcwr5x3lw7q0h7") 75 + (patch "config-write" "0jkrbqvzqrvxr14h5qi17cb4d32caq7vw9kzlz3qwpxdgxjrjvy2") 76 + (patch "recv-oob-answer" "1f67iqpj5hcgpakagi7gbw1xviwhy5vizs546l9bfjimx8r2d29g") 77 + ./pid_location.patch 78 + ]; 79 + 80 + buildInputs = [ libg15 libg15render ]; 81 + 82 + enableParallelBuilding = true; 83 + 84 + meta = { 85 + description = "A daemon that makes it possible to use the Logitech keyboard G-Buttons and draw on various Logitech LCDs"; 86 + inherit license maintainers; 87 + }; 88 + }
+25
pkgs/os-specific/linux/g15daemon/pid_location.patch
··· 1 + diff --git a/g15daemon/main.c b/g15daemon/main.c 2 + index e674475..97b8242 100644 3 + --- a/g15daemon/main.c 4 + +++ b/g15daemon/main.c 5 + @@ -574,7 +574,7 @@ exitnow: 6 + g15daemon_quit_refresh(); 7 + uf_conf_write(lcdlist,"/etc/g15daemon.conf"); 8 + uf_conf_free(lcdlist); 9 + - unlink("/var/run/g15daemon.pid"); 10 + + unlink("/run/g15daemon/g15daemon.pid"); 11 + } 12 + return 0; 13 + } 14 + diff --git a/g15daemon/utility_funcs.c b/g15daemon/utility_funcs.c 15 + index c93d164..2e9c679 100644 16 + --- a/g15daemon/utility_funcs.c 17 + +++ b/g15daemon/utility_funcs.c 18 + @@ -48,7 +48,7 @@ 19 + 20 + extern unsigned int g15daemon_debug; 21 + extern volatile int leaving; 22 + -#define G15DAEMON_PIDFILE "/var/run/g15daemon.pid" 23 + +#define G15DAEMON_PIDFILE "/run/g15daemon/g15daemon.pid" 24 + 25 + pthread_cond_t lcd_refresh = PTHREAD_COND_INITIALIZER;
+2
pkgs/top-level/all-packages.nix
··· 17738 17738 17739 17739 freepats = callPackage ../data/misc/freepats { }; 17740 17740 17741 + g15daemon = callPackage ../os-specific/linux/g15daemon {}; 17742 + 17741 17743 gentium = callPackage ../data/fonts/gentium {}; 17742 17744 17743 17745 gentium-book-basic = callPackage ../data/fonts/gentium-book-basic {};