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 with9de93be6cdand47330b1732this patch fixes the nixos printer test timing out in `waitForUnit("cups.service")`; see NixOS/nixpkgs#14748
This commit is contained in:
@@ -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
|
||||
]);
|
||||
|
||||
Reference in New Issue
Block a user