diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-12-22 16:19:47 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-12-25 12:34:50 +0100 |
commit | 700adb32e9cef98c1acddfd8ef4967471c44faa6 (patch) | |
tree | 1aade39446dc4a9c7397d935a6997db634a83e7e /nixos | |
parent | d70cee46ab9b0908157613ab6f27fc38f12aec69 (diff) |
nixos/sane: point SANE_CONFIG_DIR away from /etc/sane.d
This brings back the ability to e.g. configure sane-airscan with `environment.etc."sane.d/airscan.conf".text = ...`. (AFAICT, sane-airscan loads all config files it finds, so it'll first load the one from the nixos hardware.sane.* configuration, then the user specified one in /etc/sane.d/airscan.conf.) Fixes: 4fbec87a5bfc ("nixos/sane: point env vars to /etc for quick reload") Fixes https://github.com/NixOS/nixpkgs/issues/207262
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/hardware/sane.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 60354c7644f7b..2cac2e8e8bb47 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -28,7 +28,7 @@ let }; env = { - SANE_CONFIG_DIR = "/etc/sane.d"; + SANE_CONFIG_DIR = "/etc/sane-config"; LD_LIBRARY_PATH = [ "/etc/sane-libs" ]; }; @@ -167,7 +167,7 @@ in environment.systemPackages = backends; environment.sessionVariables = env; - environment.etc."sane.d".source = config.hardware.sane.configDir; + environment.etc."sane-config".source = config.hardware.sane.configDir; environment.etc."sane-libs".source = "${saneConfig}/lib/sane"; services.udev.packages = backends; |