* Scrollkeeper requires DocBook XML 4.2 (not 4.3).

svn path=/nixpkgs/trunk/; revision=930

8 files changed, 30 insertions, 7 deletions

diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/builder.sh
index 3d75dccba37f..3d75dccba37f 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/builder.sh
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
new file mode 100644
index 000000000000..c3bd87a6d2f7
--- /dev/null
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, unzip}:
+
+assert unzip != null;
+
+stdenv.mkDerivation {
+  name = "docbook-xml-4.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;
+    md5 = "73fe50dfe74ca631c1602f558ed8961f";
+  };
+  buildInputs = [unzip];
+}
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/builder.sh
new file mode 100644
index 000000000000..3d75dccba37f
--- /dev/null
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/builder.sh
@@ -0,0 +1,5 @@
+. $stdenv/setup
+
+mkdir -p $out/xml/dtd/docbook
+cd $out/xml/dtd/docbook
+unpackFile $src
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
index 93b5165724e4..93b5165724e4 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/default.nix
diff --git a/pkgs/development/libraries/scrollkeeper/builder.sh b/pkgs/development/libraries/scrollkeeper/builder.sh
index d31fc0932bde..f71ccb6e10ee 100644
--- a/pkgs/development/libraries/scrollkeeper/builder.sh
+++ b/pkgs/development/libraries/scrollkeeper/builder.sh
@@ -2,6 +2,6 @@
 
 export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
 
-configureFlags="--with-xml-catalog=$docbook_xml_dtd/xml/dtd/docbook/docbook.cat"
+configureFlags="--with-xml-catalog=$docbook_xml_dtd_42/xml/dtd/docbook/docbook.cat"
 
 genericBuild
diff --git a/pkgs/development/libraries/scrollkeeper/default.nix b/pkgs/development/libraries/scrollkeeper/default.nix
index 822b6c141073..1ad98c06f3c1 100644
--- a/pkgs/development/libraries/scrollkeeper/default.nix
+++ b/pkgs/development/libraries/scrollkeeper/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, perl, libxml2, libxslt, docbook_xml_dtd
+{ stdenv, fetchurl, perl, libxml2, libxslt, docbook_xml_dtd_42
 , perlXMLParser}:
 
 assert perl != null && libxml2 != null && libxslt != null
-  && docbook_xml_dtd != null && perlXMLParser != null;
+  && docbook_xml_dtd_42 != null && perlXMLParser != null;
 
 # !!! seems to need iconv, but cannot find it since $glibc/bin is not in PATH
 
@@ -14,5 +14,5 @@ stdenv.mkDerivation {
     md5 = "161eb3f29e30e7b24f84eb93ac696155";
   };
   buildInputs = [perl libxml2 libxslt];
-  inherit docbook_xml_dtd perlXMLParser;
+  inherit docbook_xml_dtd_42 perlXMLParser;
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 14aa65a540f3..348167acafb4 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -380,7 +380,7 @@ rec {
 
   scrollkeeper = (import ../development/libraries/scrollkeeper) {
     inherit fetchurl stdenv perl libxml2 libxslt
-            docbook_xml_dtd perlXMLParser;
+            docbook_xml_dtd_42 perlXMLParser;
   };
 
   gtkLibs = import ../development/libraries/gtk-libs-2.4 {
@@ -522,7 +522,11 @@ rec {
 
   ### DATA
 
-  docbook_xml_dtd = (import ../data/sgml+xml/schemas/xml-dtd/docbook) {
+  docbook_xml_dtd_42 = (import ../data/sgml+xml/schemas/xml-dtd/docbook-4.2) {
+    inherit fetchurl stdenv unzip;
+  };
+
+  docbook_xml_dtd_43 = (import ../data/sgml+xml/schemas/xml-dtd/docbook-4.3) {
     inherit fetchurl stdenv unzip;
   };
 
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index c64181ee0544..b748fc3d7392 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -36,7 +36,8 @@ let {
       pkgs.python
       pkgs.libxml2
       pkgs.libxslt
-      pkgs.docbook_xml_dtd
+      pkgs.docbook_xml_dtd_42
+      pkgs.docbook_xml_dtd_43
       pkgs.docbook_xml_ebnf_dtd
       pkgs.docbook_xml_xslt
       pkgs.subversion