public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cups: add systemd to build inputs on linux

Browse Source 
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
This commit is contained in:
Joachim Fasting 2016-04-16 21:59:31 +02:00
parent bcac4dd5bd
commit 7d32d92464
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/cups/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam { 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 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" "doc" "man" ]; # TODO: above outputs = [ "dev" "out" "doc" "man" ]; # TODO: above
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] 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; [ ++ optionals stdenv.isDarwin (with darwin; [
configd apple_sdk.frameworks.ApplicationServices configd apple_sdk.frameworks.ApplicationServices
]); ]);