From 7d32d924647f7736dd5847eed012df3440a45e64 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 16 Apr 2016 21:59:31 +0200 Subject: [PATCH] cups: add systemd to build inputs on linux Otherwise, cups will be built without systemd support. The upstream systemd service unit expects cups to have systemd support however. When cups is built without systemd support, the daemon will fork to the background. Consequently, systemd will think the service is done and enter inactive state. Along with 9de93be6cd448bdce64e7ef5cf80ff8d81592140 and 47330b1732b67e7d5fee283685b48fdcafdc91e6 this patch fixes the nixos printer test timing out in `waitForUnit("cups.service")`; see NixOS/nixpkgs#14748 --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ff8a0ec417b..cd969372c64 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam -, dbus, acl, gmp, darwin +, dbus, systemd, acl, gmp, darwin , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "doc" "man" ]; # TODO: above buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] - ++ optionals stdenv.isLinux [ avahi pam dbus acl ] + ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]);