From df6f5ade4021995aeec9b077b3d208390018ab66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Sep 2013 23:56:38 +0200
Subject: [PATCH] cupsd: Use Type=forking

http://hydra.nixos.org/build/6291101
---
 modules/services/printing/cupsd.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index a01aadb760a3..c9a4a9087e56 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -115,11 +115,11 @@ in
     # gets loaded, and then cups cannot access the printers.
     boot.blacklistedKernelModules = [ "usblp" ];
 
-    jobs.cupsd =
+    systemd.services.cupsd =
       { description = "CUPS Printing Daemon";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network-interfaces.target" ];
 
         path = [ cups ];
 
@@ -131,7 +131,8 @@ in
             mkdir -m 0755 -p ${cfg.tempDir}
           '';
 
-        exec = "cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf} -F";
+        serviceConfig.Type = "forking";
+        serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf}";
       };
 
     services.printing.drivers =