summary refs log tree commit diff
diff options
context:
space:
mode:
authorJens Nolte <git@queezle.net>2021-09-19 18:05:12 +0200
committerJens Nolte <git@queezle.net>2021-09-29 05:36:56 +0200
commite66332826a5b1d19d03535c9305c4477e249e9a9 (patch)
treec0137dcebc737634f95854b5d4cf2a7e75489b68
parenta3a23d9599b0a82e333ad91db2cdc479313ce154 (diff)
downloadnixpkgs-e66332826a5b1d19d03535c9305c4477e249e9a9.tar
nixpkgs-e66332826a5b1d19d03535c9305c4477e249e9a9.tar.gz
nixpkgs-e66332826a5b1d19d03535c9305c4477e249e9a9.tar.bz2
nixpkgs-e66332826a5b1d19d03535c9305c4477e249e9a9.tar.lz
nixpkgs-e66332826a5b1d19d03535c9305c4477e249e9a9.tar.xz
nixpkgs-e66332826a5b1d19d03535c9305c4477e249e9a9.tar.zst
nixpkgs-e66332826a5b1d19d03535c9305c4477e249e9a9.zip
lirc: Set a writable lockdir
-rw-r--r--nixos/modules/services/hardware/lirc.nix2
-rw-r--r--pkgs/development/libraries/lirc/default.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
index 826e512c75d..f970b0a095c 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -65,7 +65,7 @@ in {
       unitConfig.Documentation = [ "man:lircd(8)" ];
 
       serviceConfig = {
-        RuntimeDirectory = "lirc";
+        RuntimeDirectory = ["lirc" "lirc/lock"];
 
         # Service runtime directory and socket share same folder.
         # Following hacks are necessary to get everything right:
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 4544fd08aa5..6ba5517c028 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/lib/systemd/system"
     "--enable-uinput" # explicit activation because build env has no uinput
     "--enable-devinput" # explicit activation because build env has no /dev/input
+    "--with-lockdir=/run/lirc/lock" # /run/lock is not writable for 'lirc' user
   ];
 
   installFlags = [