nixos/lirc: expose socket path via passthru

2 files changed, 4 insertions, 10 deletions

diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
index ece38bd1e1cd..826e512c75d1 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -32,14 +32,6 @@ in {
         default = [];
         description = "Extra arguments to lircd.";
       };
-
-      socket = mkOption {
-        type = types.path;
-        # default search path of many applications
-        default = "/run/lirc/lircd";
-        description = "Socket path";
-      };
-
     };
   };
 
@@ -50,13 +42,15 @@ in {
     # Note: LIRC executables raises a warning, if lirc_options.conf do not exists
     environment.etc."lirc/lirc_options.conf".text = cfg.options;
 
+    passthru.lirc.socket = "/run/lirc/lircd";
+
     environment.systemPackages = [ pkgs.lirc ];
 
     systemd.sockets.lircd = {
       description = "LIRC daemon socket";
       wantedBy = [ "sockets.target" ];
       socketConfig = {
-        ListenStream = cfg.socket;
+        ListenStream = config.passthru.lirc.socket;
         SocketUser = "lirc";
         SocketMode = "0660";
       };
diff --git a/nixos/modules/services/hardware/vdr.nix b/nixos/modules/services/hardware/vdr.nix
index 695f0cbab1fc..4822506a899b 100644
--- a/nixos/modules/services/hardware/vdr.nix
+++ b/nixos/modules/services/hardware/vdr.nix
@@ -75,7 +75,7 @@ in {
     services.lirc.enable = true;
     users.users.vdr.extraGroups = [ "lirc" ];
     services.vdr.extraArguments = [
-      "--lirc=${config.services.lirc.socket}"
+      "--lirc=${config.passthru.lirc.socket}"
     ];
   })]);
 }