nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

GTK-doc: More fixes.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14720
This commit is contained in:
Ludovic Courtès 2009-03-25 23:16:02 +00:00
parent 91aeb56b97
commit 02c50ac314
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/gnome/default.nix
View File

@ -319,8 +319,9 @@ rec {
gtkdoc = import ./gtkdoc.nix { gtkdoc = import ./gtkdoc.nix {
inherit (platform) gtkdoc; inherit (platform) gtkdoc;
inherit stdenv pkgconfig gnomedocutils perl libxml2 inherit stdenv pkgconfig gnomedocutils perl python libxml2
xmlto docbook2x docbook_xsl docbook_xml_dtd_412 libxslt; xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt
scrollkeeper;
}; };
}; };

19
pkgs/desktops/gnome/gtkdoc.nix
View File

@ -1,14 +1,14 @@
{ stdenv, gtkdoc, pkgconfig, gnomedocutils, perl { stdenv, gtkdoc, pkgconfig, gnomedocutils, perl, python
, libxml2, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 , libxml2, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_43
, libxslt }: , libxslt, scrollkeeper }:
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (gtkdoc) name src; inherit (gtkdoc) name src;
inherit docbook_xml_dtd_412; inherit docbook_xml_dtd_43;
buildInputs = [ pkgconfig perl gnomedocutils buildInputs = [ pkgconfig perl python gnomedocutils
libxml2 libxml2 scrollkeeper
xmlto docbook2x docbook_xsl docbook_xml_dtd_412 libxslt ]; xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt ];
# maybe there is a better way to pass the needed dtd and xsl files # 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"> <!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"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<nextCatalog catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" /> <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> </catalog>
EOF EOF
configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml"
configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper";
''; '';
} }

1
pkgs/top-level/all-packages.nix
View File

@ -9177,6 +9177,7 @@ let
fetchurl stdenv pkgconfig fetchurl stdenv pkgconfig
flex bison popt zlib libxml2 libxslt flex bison popt zlib libxml2 libxslt
perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412 perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412
docbook_xml_dtd_43
gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2 gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
libcm python dbus dbus_glib ncurses which libxml2Python libcm python dbus dbus_glib ncurses which libxml2Python
iconnamingutils openssl hal samba fam libgcrypt libtasn1 iconnamingutils openssl hal samba fam libgcrypt libtasn1