Merge pull request #199667 from bjornfor/nixos-sane-indirection-for-quick-reload

nixos/sane: point env vars to /etc for quick reload

Changed files
+4 -2
nixos
modules
services
hardware
+4 -2
nixos/modules/services/hardware/sane.nix
···
};
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;
···
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;