movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

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

Browse source 
nixos/sane: point env vars to /etc for quick reload
This commit is contained in:
Guillaume Girol 2022-11-13 10:05:05 +00:00 • committed by GitHub
commit 4c633f0301
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/hardware/sane.nix
View file

@ -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;