public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cupsd service: use cups-pk-helper is policykit is enabled

This commit is contained in:
Nikolay Amiantov 2016-01-17 03:34:39 +03:00
parent a8b3e686d0
commit 06865208e8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/printing/cupsd.nix
View File

@ -4,10 +4,13 @@ with lib;
let let
inherit (pkgs) cups cups_filters; inherit (pkgs) cups cups-pk-helper cups_filters;
cfg = config.services.printing; cfg = config.services.printing;
avahiEnabled = config.services.avahi.enable;
polkitEnabled = config.security.polkit.enable;
additionalBackends = pkgs.runCommand "additional-cups-backends" { } additionalBackends = pkgs.runCommand "additional-cups-backends" { }
'' ''
mkdir -p $out mkdir -p $out
@ -204,7 +207,7 @@ in
description = "CUPS printing services"; description = "CUPS printing services";
}; };
environment.systemPackages = [ cups ]; environment.systemPackages = [ cups ] ++ optional polkitEnabled cups-pk-helper;
environment.etc."cups/client.conf".text = cfg.clientConf; environment.etc."cups/client.conf".text = cfg.clientConf;
environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf; environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf;
@ -212,7 +215,7 @@ in
environment.etc."cups/cups-browsed.conf".text = cfg.browsedConf; environment.etc."cups/cups-browsed.conf".text = cfg.browsedConf;
environment.etc."cups/snmp.conf".text = cfg.snmpConf; environment.etc."cups/snmp.conf".text = cfg.snmpConf;
services.dbus.packages = [ cups ]; services.dbus.packages = [ cups ] ++ optional polkitEnabled cups-pk-helper;
# Cups uses libusb to talk to printers, and does not use the # Cups uses libusb to talk to printers, and does not use the
# linux kernel driver. If the driver is not in a black list, it # linux kernel driver. If the driver is not in a black list, it
@ -242,7 +245,7 @@ in
]; ];
}; };
systemd.services.cups-browsed = mkIf config.services.avahi.enable systemd.services.cups-browsed = mkIf avahiEnabled
{ description = "CUPS Remote Printer Discovery"; { description = "CUPS Remote Printer Discovery";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];