diff options
Diffstat (limited to 'pkgs/misc/cups/default.nix')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 4373006504194..d140ee4783f0f 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 }: @@ -18,8 +18,11 @@ stdenv.mkDerivation { sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn"; }; + # FIXME: the cups libraries contains some $out/share strings so can't be split. + outputs = [ "dev" "out" "man" ]; # TODO: above + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] - ++ optionals stdenv.isLinux [ avahi pam dbus.libs acl ] + ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]); @@ -68,6 +71,9 @@ stdenv.mkDerivation { # Delete obsolete stuff that conflicts with cups-filters. rm -rf $out/share/cups/banners $out/share/cups/data/testprint + mkdir $dev/bin + mv $out/bin/cups-config $dev/bin/ + # Rename systemd files provided by CUPS for f in $out/lib/systemd/system/*; do substituteInPlace "$f" \ |