Unverified Commit 4c633f03 authored by Guillaume Girol's avatar Guillaume Girol Committed by GitHub
Browse files

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

nixos/sane: point env vars to /etc for quick reload
parents 91ddc40c 4fbec87a

nixos/modules/services/hardware/sane.nix

+4 −2
Original line number Diff line number Diff line
@@ -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;