From 4ac95ab3282a5aa364c8c1e51b9637b38729a3a7 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 28 Apr 2015 20:37:34 +0200 Subject: cups: Use systemd files provided by CUPS --- nixos/modules/services/printing/cupsd.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'nixos/modules/services/printing') diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index b573a356b351..a69a8aab86a3 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -183,10 +183,10 @@ in # gets loaded, and then cups cannot access the printers. boot.blacklistedKernelModules = [ "usblp" ]; - systemd.services.cups = - { description = "CUPS Printing Daemon"; + systemd.packages = [ cups ]; - wantedBy = [ "multi-user.target" ]; + systemd.services.cups = + { wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; @@ -200,9 +200,6 @@ in mkdir -m 0755 -p ${cfg.tempDir} ''; - serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd"; - restartTriggers = [ config.environment.etc."cups/cups-files.conf".source config.environment.etc."cups/cupsd.conf".source -- cgit 1.4.1