diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-10-18 21:08:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-10-18 21:08:47 +0000 |
| commit | eaa4db148dc402f7a124bc9c17583067710a7814 (patch) | |
| tree | 91178298375eb468e36b34f44e24d9b6c8343cbc /pkgs/desktops | |
| parent | f6073d7f348309397e30f6bc1ec1127d244756ae (diff) | |
| download | nixpkgs-eaa4db148dc402f7a124bc9c17583067710a7814.tar nixpkgs-eaa4db148dc402f7a124bc9c17583067710a7814.tar.gz nixpkgs-eaa4db148dc402f7a124bc9c17583067710a7814.tar.bz2 nixpkgs-eaa4db148dc402f7a124bc9c17583067710a7814.tar.lz nixpkgs-eaa4db148dc402f7a124bc9c17583067710a7814.tar.xz nixpkgs-eaa4db148dc402f7a124bc9c17583067710a7814.tar.zst nixpkgs-eaa4db148dc402f7a124bc9c17583067710a7814.zip | |
* libxml2 / libxslt: provide a setup hook that prevents xmllint and
xsltproc from downloading DTDs from the network, which is impure. This caused a lot of problems with Gnome builds in the build farm, because those downloads are slow and would sometimes fail. The setup hook also sets up $XML_CATALOG_FILES. svn path=/nixpkgs/trunk/; revision=9471
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/scrollkeeper.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/xmlcatalog.patch | 37 |
3 files changed, 5 insertions, 39 deletions
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 0c330c161f3..6410e9c053a 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -2,7 +2,8 @@ { stdenv, fetchurl, pkgconfig, audiofile , flex, bison, popt, perl, zlib, libxml2, libxslt -, perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg +, perlXMLParser, docbook_xml_dtd_42, docbook_xml_dtd_412 +, gettext, x11, libtiff, libjpeg , libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib, ncurses , which, libxml2Python, iconnamingutils }: diff --git a/pkgs/desktops/gnome/scrollkeeper.nix b/pkgs/desktops/gnome/scrollkeeper.nix index ffdbe065912..105d585b39f 100644 --- a/pkgs/desktops/gnome/scrollkeeper.nix +++ b/pkgs/desktops/gnome/scrollkeeper.nix @@ -4,7 +4,9 @@ stdenv.mkDerivation { inherit (input) name src; - patches = [./xmlcatalog.patch]; + preConfigure = " + substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog + "; buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; } diff --git a/pkgs/desktops/gnome/xmlcatalog.patch b/pkgs/desktops/gnome/xmlcatalog.patch deleted file mode 100644 index 77313819fce..00000000000 --- a/pkgs/desktops/gnome/xmlcatalog.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rrc scrollkeeper-orig/extract/dtds/Makefile.in scrollkeeper-0.3.14/extract/dtds/Makefile.in -*** scrollkeeper-orig/extract/dtds/Makefile.in 2003-12-06 09:18:01.000000000 +0100 ---- scrollkeeper-0.3.14/extract/dtds/Makefile.in 2005-03-08 19:22:27.000000000 +0100 -*************** -*** 408,414 **** - - # ScrollKeeper OMF Variation DTD V1.0 - install-data-hook: -! -/usr/bin/xmlcatalog --noout --add "public" \ - "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ - "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) - ---- 408,414 ---- - - # ScrollKeeper OMF Variation DTD V1.0 - install-data-hook: -! -xmlcatalog --noout --add "public" \ - "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ - "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) - -*************** -*** 418,424 **** - - # ScrollKeeper OMF Variation DTD V1.0 - uninstall-local: -! -/usr/bin/xmlcatalog --noout --del \ - "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. ---- 418,424 ---- - - # ScrollKeeper OMF Variation DTD V1.0 - uninstall-local: -! -xmlcatalog --noout --del \ - "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. |