Merge branch 'staging'

3 files changed, 36 insertions, 24 deletions

diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh b/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh
deleted file mode 100644
index 96ad77eaa57c..000000000000
--- a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-source $stdenv/setup
-
-unpackFile $src
-
-cd docbook-*
-
-mkdir -p $out/xml/rng
-cp -prv rng $out/xml/rng/docbook
-
-mkdir -p $out/xml/dtd
-cp -prv dtd $out/xml/dtd/docbook
-
-mkdir -p $out/share/doc
-cp -prv docs $out/share/doc/docbook
-
-mkdir -p $out/share/docbook
-cp -prv tools $out/share/docbook/
diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
index 1e0103a93059..a9d09945d7ff 100644
--- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
+++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
@@ -1,13 +1,35 @@
-{stdenv, fetchurl, unzip}:
+{ lib, stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "docbook5-5.0";
-  builder = ./builder.sh;
 
   src = fetchurl {
     url = http://www.docbook.org/xml/5.0/docbook-5.0.zip;
     sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x";
   };
 
-  buildInputs = [unzip];
+  buildInputs = [ unzip ];
+
+  installPhase =
+    ''
+      dst=$out/share/xml/docbook-5.0
+      mkdir -p $dst
+      cp -prv * $dst/
+
+      substituteInPlace $dst/catalog.xml --replace 'uri="' "uri=\"$dst/"
+
+      rm -rf $dst/docs $dst/ChangeLog
+
+      # Backwards compatibility. Will remove eventually.
+      mkdir -p $out/xml/rng $out/xml/dtd
+      ln -s $dst/rng $out/xml/rng/docbook
+      ln -s $dst/dtd $out/xml/dtd/docbook
+    '';
+
+  meta = {
+    description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation";
+    homepage = http://docbook.org/xml/5.0/;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.all;
+  };
 }
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
index bfe454a49fe1..36d2cc48c9f0 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "docbook-xsl-ns-1.78.1";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/docbook/${name}.tar.bz2";
     sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
@@ -12,13 +12,20 @@ stdenv.mkDerivation rec {
 
   installPhase =
     ''
+      dst=$out/share/xml/docbook-xsl-ns
+      mkdir -p $dst
+      rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
+      mv * $dst/
+
+      # Backwards compatibility. Will remove eventually.
       mkdir -p $out/xml/xsl
-      cd ..
-      mv docbook-xsl-ns-* $out/xml/xsl/docbook
+      ln -s $dst $out/xml/xsl/docbook
     '';
 
   meta = {
     homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
     description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.all;
   };
 }