NixOS · May 26, 2019 · May 26, 2019 · May 26, 2019 · May 26, 2019 · May 26, 2019
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libical-${version}";
   version = "3.0.4";
 
-  outputs = [ "out" "dev" ]; #"devdoc" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchFromGitHub {
     owner = "libical";
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     perl pkgconfig cmake ninja vala gobject-introspection
     (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
-# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
-#    gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
+    gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
   ];
   buildInputs = [ glib libxml2 icu ];
 

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "--disable-builtin"
     "--disable-static"
-#    "--enable-gtk-doc"
+    "--enable-gtk-doc"
     "--enable-man"
   ];
 

diff --git a/...development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch b/...development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,59 +1,30 @@
-{ stdenv
-, fetchFromGitLab
-, meson
-, ninja
-, pkgconfig
-, python3
-, libxml2Python
-, docbook_xml_dtd_43
-, docbook_xsl
-, libxslt
-, gettext
-, gnome3
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which
+, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3
 , withDblatex ? false, dblatex
 }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-doc";
-  version = "1.30";
+  version = "1.29";
 
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = pname;
-    rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
-    sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi";
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql";
   };
 
   patches = [
     passthru.respect_xml_catalog_files_var_patch
-    # https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
-    ./0001-highlight-fix-permission-on-file-style.patch
   ];
 
   outputDevdoc = "out";
 
-  nativeBuildInputs = [
-    gettext
-    meson
-    ninja
-  ];
-
-  buildInputs = [
-    docbook_xml_dtd_43
-    docbook_xsl
-    libxslt
-    pkgconfig
-    python3
-    libxml2Python
-  ]
-  ++ stdenv.lib.optional withDblatex dblatex
-  ;
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs =
+    [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
+      gnome-doc-utils gettext which itstool
+    ] ++ stdenv.lib.optional withDblatex dblatex;
 
-  mesonFlags = [
-    "-Dtests=false"
-    "-Dyelp_manual=false"
-  ];
+  configureFlags = [ "--disable-scrollkeeper" ];
 
   # Make pygments available for binaries, python.withPackages creates a wrapper
   # but scripts are not allowed in shebangs so we link it into sys.path.