diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-11-13 10:05:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-13 10:05:05 +0000 |
| commit | 4c633f03013a7bfeeef74b5258d1e1c84ed94ded (patch) | |
| tree | 85f6e490fa83f6cfa89e2a7a68d3aa56d74ed830 /nixos | |
| parent | 91ddc40c59ea29695c73660fa84d8a85c8cadc68 (diff) | |
| parent | 4fbec87a5bfc11e60b98523e55c813c6fadf655b (diff) | |
Merge pull request #199667 from bjornfor/nixos-sane-indirection-for-quick-reload
nixos/sane: point env vars to /etc for quick reload
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/hardware/sane.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index cb9bee6130c63..dd5c65b1f6a64 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -28,8 +28,8 @@ let }; env = { - SANE_CONFIG_DIR = config.hardware.sane.configDir; - LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; + SANE_CONFIG_DIR = "/etc/sane.d"; + LD_LIBRARY_PATH = [ "/etc/sane-libs" ]; }; backends = [ pkg netConf ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends; @@ -158,6 +158,8 @@ in environment.systemPackages = backends; environment.sessionVariables = env; + environment.etc."sane.d".source = config.hardware.sane.configDir; + environment.etc."sane-libs".source = "${saneConfig}/lib/sane"; services.udev.packages = backends; users.groups.scanner.gid = config.ids.gids.scanner; |