diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:25:41 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:25:41 +0200 |
commit | 70babe5bcf383629a6adff3f2874d1b661462146 (patch) | |
tree | dfbbfa66d02e6ea8fd2d691defcd2307e8f9f16f /nixos/modules/services/hardware | |
parent | 52cd3538ff0214f0416455322cec299d2a43a436 (diff) | |
parent | c04a14edd6096a2d55d3b62ca182739dac9b7ede (diff) | |
download | nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.gz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.bz2 nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.lz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.xz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.zst nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'nixos/modules/services/hardware')
-rw-r--r-- | nixos/modules/services/hardware/sane.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 29e5fbaee6b..e5a01a8a27d 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -30,7 +30,7 @@ let }; backends = [ pkg netConf ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends; - saneConfig = pkgs.mkSaneConfig { paths = backends; }; + saneConfig = pkgs.mkSaneConfig { paths = backends; inherit (config.hardware.sane) disabledDefaultBackends; }; enabled = config.hardware.sane.enable || config.services.saned.enable; @@ -73,6 +73,16 @@ in example = literalExample "[ pkgs.hplipWithPlugin ]"; }; + hardware.sane.disabledDefaultBackends = mkOption { + type = types.listOf types.str; + default = []; + example = [ "v4l" ]; + description = '' + Names of backends which are enabled by default but should be disabled. + See <literal>$SANE_CONFIG_DIR/dll.conf</literal> for the list of possible names. + ''; + }; + hardware.sane.configDir = mkOption { type = types.str; internal = true; |