From 9de93be6cd448bdce64e7ef5cf80ff8d81592140 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 16 Apr 2016 19:18:07 +0200 Subject: [PATCH] cups service: use cups.out everywhere Seeing as the dev output is the default, we probably want cups.out everywhere. --- nixos/modules/services/printing/cupsd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index e4c96c24e64b..0bcb1a0c20c4 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -34,7 +34,7 @@ let bindir = pkgs.buildEnv { name = "cups-progs"; paths = - [ cups additionalBackends cups_filters pkgs.ghostscript ] + [ cups.out additionalBackends cups_filters pkgs.ghostscript ] ++ optional cfg.gutenprint gutenprint ++ cfg.drivers; pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ]; @@ -267,10 +267,10 @@ in 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"; - 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 # linux kernel driver. If the driver is not in a black list, it @@ -284,7 +284,7 @@ in wants = [ "network.target" ]; after = [ "network.target" ]; - path = [ cups ]; + path = [ cups.out ]; preStart = ''