diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-03-25 23:16:02 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-03-25 23:16:02 +0000 |
| commit | 02c50ac31421d898d60c0c80a594fb9fdfa589c2 (patch) | |
| tree | d8540c1b867226eb2fdbafa3bff33bd6c71c984e /pkgs/desktops | |
| parent | 91aeb56b978892e41fd46c4d71f59a9408ae9ed4 (diff) | |
| download | nixlib-02c50ac31421d898d60c0c80a594fb9fdfa589c2.tar nixlib-02c50ac31421d898d60c0c80a594fb9fdfa589c2.tar.gz nixlib-02c50ac31421d898d60c0c80a594fb9fdfa589c2.tar.bz2 nixlib-02c50ac31421d898d60c0c80a594fb9fdfa589c2.tar.lz nixlib-02c50ac31421d898d60c0c80a594fb9fdfa589c2.tar.xz nixlib-02c50ac31421d898d60c0c80a594fb9fdfa589c2.tar.zst nixlib-02c50ac31421d898d60c0c80a594fb9fdfa589c2.zip | |
GTK-doc: More fixes.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14720
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/gtkdoc.nix | 19 |
2 files changed, 13 insertions, 11 deletions
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 { <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <nextCatalog catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" /> - <nextCatalog catalog="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" /> + <nextCatalog catalog="${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" /> </catalog> EOF - configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml" + + configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; ''; } |