Merge pull request #24050 from shanemikel/package_htmldoc

htmldoc: add darwin support

lib/maintainers.nix

@@ -456,6 +456,7 @@
   scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
+  shanemikel = "Shane Pearlman <shanemikel1@gmail.com>";
   sheenobu = "Sheena Artrip <sheena.artrip@gmail.com>";
   sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>";
   shell = "Shell Turner <cam.turn@gmail.com>";

pkgs/applications/misc/htmldoc/default.nix

@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, fltk, openssl, libpng, libjpeg }:
-stdenv.mkDerivation rec {
-  name = "htmldoc-1.8.27";
-  src = fetchurl {
-    url = http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2;
-    sha256 = "04wnxgx6fxdxwiy9vbawdibngwf55mi01hjrr5fkfs22fcix5zw9";
-  };
-  buildInputs = [ fltk openssl libpng libjpeg ];
-  meta = {
-    homepage = http://www.htmldoc.org/;
-    description = "Converts HTML files to indexed HTML, PS or PDF";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}

pkgs/tools/typesetting/htmldoc/default.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchurl
+
+, SystemConfiguration ? null, Foundation ? null
+}:
+
+assert stdenv.isDarwin -> SystemConfiguration != null
+                       && Foundation != null;
+
+stdenv.mkDerivation rec {
+  version = "1.8.29";
+  name = "htmldoc-${version}";
+  src = fetchurl {
+    url = "https://github.com/michaelrsweet/htmldoc/releases/download"
+      + "/release-${version}/htmldoc-${version}-source.tar.gz";
+    sha256 = "15x0xdf487j4i4gfap5yr83airxnbp2v4lxaz79a4s3iirrq39p0";
+  };
+  buildInputs = with stdenv;
+       lib.optional isDarwin SystemConfiguration
+    ++ lib.optional isDarwin Foundation;
+
+  meta = with stdenv.lib; {
+    description = "Converts HTML files to PostScript and PDF";
+    homepage    = https://michaelrsweet.github.io/htmldoc;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ viric shanemikel ];
+    platforms   = with platforms; linux ++ darwin;
+
+    longDescription = ''
+      HTMLDOC is a program that reads HTML source files or web pages and
+      generates corresponding HTML, PostScript, or PDF files with an optional
+      table of contents.
+    '';
+  };
+}

pkgs/top-level/all-packages.nix

@@ -4381,6 +4381,10 @@ with pkgs;
 
   html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
 
+  htmldoc = callPackage ../tools/typesetting/htmldoc {
+    inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation;
+  };
+
   rcm = callPackage ../tools/misc/rcm {};
 
   tftp-hpa = callPackage ../tools/networking/tftp-hpa {};
@@ -13980,10 +13984,6 @@ with pkgs;
 
   ht = callPackage ../applications/editors/ht { };
 
-  htmldoc = callPackage ../applications/misc/htmldoc {
-    fltk = fltk13;
-  };
-
   hugin = callPackage ../applications/graphics/hugin { };
 
   hugo = callPackage ../applications/misc/hugo { };