alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cups service: use cups.out everywhere

Browse source 
Seeing as the dev output is the default, we probably want cups.out
everywhere.
This commit is contained in:
Joachim Fasting 2016-04-16 19:18:07 +02:00
parent b9860795c7
commit 9de93be6cd
No known key found for this signature in database
GPG key ID: 4330820E1E04DCF4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/printing/cupsd.nix
View file

@ -34,7 +34,7 @@ let
bindir = pkgs.buildEnv { bindir = pkgs.buildEnv {
name = "cups-progs"; name = "cups-progs";
paths = paths =
[ cups additionalBackends cups_filters pkgs.ghostscript ] [ cups.out additionalBackends cups_filters pkgs.ghostscript ]
++ optional cfg.gutenprint gutenprint ++ optional cfg.gutenprint gutenprint
++ cfg.drivers; ++ cfg.drivers;
pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ]; pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ];
@ -267,10 +267,10 @@ in
description = "CUPS printing services"; description = "CUPS printing services";
}; };
environment.systemPackages = [ cups ] ++ optional polkitEnabled cups-pk-helper; environment.systemPackages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
environment.etc."cups".source = "/var/lib/cups"; environment.etc."cups".source = "/var/lib/cups";
services.dbus.packages = [ cups ] ++ optional polkitEnabled cups-pk-helper; services.dbus.packages = [ cups.out ] ++ 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
@ -284,7 +284,7 @@ in
wants = [ "network.target" ]; wants = [ "network.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
path = [ cups ]; path = [ cups.out ];
preStart = preStart =
'' ''