Merge pull request #171709 from avdv/fix-illum-segfault-and-restart
illum: Prevent segfault when unplugging keyboards
This commit is contained in:
commit
1d09b16b0c
|
@ -28,6 +28,7 @@ in {
|
||||||
description = "Backlight Adjustment Service";
|
description = "Backlight Adjustment Service";
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig.ExecStart = "${pkgs.illum}/bin/illum-d";
|
serviceConfig.ExecStart = "${pkgs.illum}/bin/illum-d";
|
||||||
|
serviceConfig.Restart = "on-failure";
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "illum";
|
pname = "illum";
|
||||||
|
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
|
||||||
fetchSubmodules = true;
|
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 ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ ninja libevdev libev udev ];
|
buildInputs = [ ninja libevdev libev udev ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue