diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index ae424907a611..7ff1b1d16c6e 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -319,8 +319,9 @@ rec { gtkdoc = import ./gtkdoc.nix { inherit (platform) gtkdoc; - inherit stdenv pkgconfig gnomedocutils perl libxml2 - xmlto docbook2x docbook_xsl docbook_xml_dtd_412 libxslt; + inherit stdenv pkgconfig gnomedocutils perl python libxml2 + xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt + scrollkeeper; }; }; diff --git a/pkgs/desktops/gnome/gtkdoc.nix b/pkgs/desktops/gnome/gtkdoc.nix index e4f5cdf1c138..5ecb3df72b4f 100644 --- a/pkgs/desktops/gnome/gtkdoc.nix +++ b/pkgs/desktops/gnome/gtkdoc.nix @@ -1,14 +1,14 @@ -{ stdenv, gtkdoc, pkgconfig, gnomedocutils, perl -, libxml2, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 -, libxslt }: +{ stdenv, gtkdoc, pkgconfig, gnomedocutils, perl, python +, libxml2, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_43 +, libxslt, scrollkeeper }: stdenv.mkDerivation { inherit (gtkdoc) name src; - inherit docbook_xml_dtd_412; - buildInputs = [ pkgconfig perl gnomedocutils - libxml2 - xmlto docbook2x docbook_xsl docbook_xml_dtd_412 libxslt ]; + inherit docbook_xml_dtd_43; + buildInputs = [ pkgconfig perl python gnomedocutils + libxml2 scrollkeeper + xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt ]; # maybe there is a better way to pass the needed dtd and xsl files @@ -20,9 +20,10 @@ stdenv.mkDerivation { - + EOF - configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml" + + configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e37d354ebe2d..f5c251597c1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9177,6 +9177,7 @@ let fetchurl stdenv pkgconfig flex bison popt zlib libxml2 libxslt perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412 + docbook_xml_dtd_43 gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm python dbus dbus_glib ncurses which libxml2Python iconnamingutils openssl hal samba fam libgcrypt libtasn1