Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.

pkgs/misc/cups/default.nix

@@ -1,8 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb, acl, gmp }:
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
+, dbus, acl, gmp
+, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
+}:
 
-let version = "1.7.5"; in
+let version = "2.0.4"; in
 
+with stdenv.lib;
 stdenv.mkDerivation {
   name = "cups-${version}";
 
@@ -10,18 +13,30 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq";
+    sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
   };
 
   # FIXME: Split off the cups client library.
   outputs = [ "dev" "out" "doc" "man" ];
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
+    ++ optionals stdenv.isLinux [ pam dbus.libs acl ];
 
-  propagatedBuildInputs = [ openssl gmp ];
+  propagatedBuildInputs = [ gmp ];
 
-  configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+    "--with-systemd=\${out}/lib/systemd/system"
+    "--enable-raw-printing"
+    "--enable-threads"
+  ] ++ optionals stdenv.isLinux [
+    "--enable-dbus"
+    "--enable-pam"
+  ] ++ optional (libusb != null) "--enable-libusb"
+    ++ optional (gnutls != null) "--enable-ssl"
+    ++ optional (avahi != null) "--enable-avahi"
+    ++ optional (libpaper != null) "--enable-libpaper";
 
   installFlags =
     [ # Don't try to write in /var at build time.
@@ -42,20 +57,36 @@ stdenv.mkDerivation {
       "CUPS_PRIMARY_SYSTEM_GROUP=root"
     ];
 
-  postInstall =
-    ''
+  postInstall = ''
       # 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" \
+          --replace "org.cups.cupsd" "cups" \
+          --replace "org.cups." ""
+
+        if [[ "$f" =~ .*cupsd\..* ]]; then
+          mv "$f" "''${f/org\.cups\.cupsd/cups}"
+        else
+          mv "$f" "''${f/org\.cups\./}"
+        fi
+      done
+    '' + optionalString stdenv.isLinux ''
+      # Use xdg-open when on Linux
+      substituteInPlace $out/share/applications/cups.desktop \
+        --replace "Exec=htmlview" "Exec=xdg-open"
     '';
 
   meta = {
-    homepage = "http://www.cups.org/";
+    homepage = https://cups.org/;
     description = "A standards-based printing system for UNIX";
-    license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest
-    maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
+    maintainers = with maintainers; [ urkud simons jgeerds ];
+    platforms = platforms.linux;
   };
 }