b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #171709 from avdv/fix-illum-segfault-and-restart

Browse source 
illum: Prevent segfault when unplugging keyboards
This commit is contained in:
Artturi 2022-05-07 17:40:52 +03:00 committed by GitHub
parent d8cee34f75 fd3d1a834b
commit 1d09b16b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/hardware/illum.nix
View file

@ -28,6 +28,7 @@ in {
description = "Backlight Adjustment Service";
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.illum}/bin/illum-d";
serviceConfig.Restart = "on-failure";
};
};

10
pkgs/tools/system/illum/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, ninja, libevdev, libev, udev }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ninja, libevdev, libev, udev }:
stdenv.mkDerivation rec {
pname = "illum";
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
(fetchpatch {
name = "prevent-unplug-segfault"; # See https://github.com/jmesmon/illum/issues/19
url = "https://github.com/jmesmon/illum/commit/47b7cd60ee892379e5d854f79db343a54ae5a3cc.patch";
sha256 = "sha256-hIBBCIJXAt8wnZuyKye1RiEfOCelP3+4kcGrM43vFOE=";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ninja libevdev libev udev ];