summary refs log tree commit diff
path: root/nixos/modules/services/printing/cupsd.nix
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-04-16 19:18:07 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2016-04-16 21:26:33 +0200
commit9de93be6cd448bdce64e7ef5cf80ff8d81592140 (patch)
tree9269bc9f8cebd6407bde3c06592dd714e6eac7b9 /nixos/modules/services/printing/cupsd.nix
parentb9860795c778a74aaa2425eb8ee0f138bc64a1eb (diff)
downloadnixpkgs-9de93be6cd448bdce64e7ef5cf80ff8d81592140.tar
nixpkgs-9de93be6cd448bdce64e7ef5cf80ff8d81592140.tar.gz
nixpkgs-9de93be6cd448bdce64e7ef5cf80ff8d81592140.tar.bz2
nixpkgs-9de93be6cd448bdce64e7ef5cf80ff8d81592140.tar.lz
nixpkgs-9de93be6cd448bdce64e7ef5cf80ff8d81592140.tar.xz
nixpkgs-9de93be6cd448bdce64e7ef5cf80ff8d81592140.tar.zst
nixpkgs-9de93be6cd448bdce64e7ef5cf80ff8d81592140.zip
cups service: use cups.out everywhere
Seeing as the dev output is the default, we probably want cups.out
everywhere.
Diffstat (limited to 'nixos/modules/services/printing/cupsd.nix')
-rw-r--r--nixos/modules/services/printing/cupsd.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index e4c96c24e64..0bcb1a0c20c 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 =
           ''