summary refs log tree commit diff
path: root/nixos/modules/services/printing/cupsd.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-07-18 17:32:41 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-08-14 11:47:12 -0400
commit35e633bde520e692b91b45bbff0608ee1f1574ad (patch)
tree0b2b27ea97a91900a4165e4c5923f437921f56e3 /nixos/modules/services/printing/cupsd.nix
parent04ea093eb6057f7d87751a293dd1ec35591098dd (diff)
downloadnixpkgs-35e633bde520e692b91b45bbff0608ee1f1574ad.tar
nixpkgs-35e633bde520e692b91b45bbff0608ee1f1574ad.tar.gz
nixpkgs-35e633bde520e692b91b45bbff0608ee1f1574ad.tar.bz2
nixpkgs-35e633bde520e692b91b45bbff0608ee1f1574ad.tar.lz
nixpkgs-35e633bde520e692b91b45bbff0608ee1f1574ad.tar.xz
nixpkgs-35e633bde520e692b91b45bbff0608ee1f1574ad.tar.zst
nixpkgs-35e633bde520e692b91b45bbff0608ee1f1574ad.zip
nixos/cupsd: only enable cups when startWhenNeeded = false
cups-browsed was pulling in cups.service even when we were using the
socket-based initialization.
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 26f684af3dd..35fad46af01 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -366,10 +366,10 @@ in
       { description = "CUPS Remote Printer Discovery";
 
         wantedBy = [ "multi-user.target" ];
-        wants = [ "cups.service" "avahi-daemon.service" ];
-        bindsTo = [ "cups.service" "avahi-daemon.service" ];
-        partOf = [ "cups.service" "avahi-daemon.service" ];
-        after = [ "cups.service" "avahi-daemon.service" ];
+        wants = [ "avahi-daemon.service" ] ++ optional (!cfg.startWhenNeeded) "cups.service";
+        bindsTo = [ "avahi-daemon.service" ] ++ optional (!cfg.startWhenNeeded) "cups.service";
+        partOf = [ "avahi-daemon.service" ] ++ optional (!cfg.startWhenNeeded) "cups.service";
+        after = [ "avahi-daemon.service" ] ++ optional (!cfg.startWhenNeeded) "cups.service";
 
         path = [ cups ];