* Added the old DocBook XML 4.1.2 (Gnome needs it).

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

pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/builder.sh

@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/xml/dtd/docbook
-cd $out/xml/dtd/docbook
-unpackFile $src

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix

@@ -0,0 +1,24 @@
+{stdenv, fetchurl, unzip}:
+
+let
+
+  # Urgh, DocBook 4.1.2 doesn't come with an XML catalog.  Use the one
+  # from 4.2.
+  docbook42catalog = fetchurl {
+    url = http://www.docbook.org/xml/4.2/catalog.xml;
+    sha256 = "18lhp6q2l0753s855r638shkbdwq9blm6akdjsc9nrik24k38j17";
+  };
+
+in
+
+import ./generic.nix {
+  inherit stdenv fetchurl unzip;
+  name = "docbook-xml-4.1.2";
+  src = fetchurl {
+    url = http://www.docbook.org/xml/4.1.2/docbkx412.zip;
+    sha256 = "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h";
+  };
+  postInstall = "
+    sed 's|V4.2|V4.1.2|g' < ${docbook42catalog} > catalog.xml
+  ";
+}

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix

@@ -1,13 +1,10 @@
 {stdenv, fetchurl, unzip}:
 
-assert unzip != null;
+import ./generic.nix {
-
+  inherit stdenv fetchurl unzip;
-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];
 }

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix

@@ -1,13 +1,10 @@
 {stdenv, fetchurl, unzip}:
 
-assert unzip != null;
+import ./generic.nix {
-
+  inherit stdenv fetchurl unzip;
-stdenv.mkDerivation {
   name = "docbook-xml-4.3";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;
     md5 = "ab200202b9e136a144db1e0864c45074";
   };
-  buildInputs = [unzip];
 }

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh

@@ -3,3 +3,5 @@ source $stdenv/setup
 mkdir -p $out/xml/dtd/docbook
 cd $out/xml/dtd/docbook
 unpackFile $src
+find -type f -exec chmod -x {} \;
+eval "$postInstall"

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix

@@ -0,0 +1,9 @@
+{stdenv, fetchurl, unzip, src, name, postInstall ? "true"}:
+
+assert unzip != null;
+
+stdenv.mkDerivation {
+  inherit src name postInstall;
+  builder = ./builder.sh;
+  buildInputs = [unzip];
+}

pkgs/top-level/all-packages.nix

@@ -3228,11 +3228,15 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  docbook_xml_dtd_42 = import ../data/sgml+xml/schemas/xml-dtd/docbook-4.2 {
+  docbook_xml_dtd_412 = import ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix {
     inherit fetchurl stdenv unzip;
   };
 
-  docbook_xml_dtd_43 = import ../data/sgml+xml/schemas/xml-dtd/docbook-4.3 {
+  docbook_xml_dtd_42 = import ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix {
+    inherit fetchurl stdenv unzip;
+  };
+
+  docbook_xml_dtd_43 = import ../data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix {
     inherit fetchurl stdenv unzip;
   };