3 files changed, 44 insertions, 52 deletions
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
deleted file mode 100644
index 36d2cc48c9f..00000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "docbook-xsl-ns-1.78.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/docbook/${name}.tar.bz2";
-    sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
-  };
-
-  buildPhase = "true";
-
-  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
-      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;
-  };
-}
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 844789665f7..863f6044402 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,24 +1,47 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
-  name = "docbook-xsl-1.78.1";
+let
 
-  src = fetchurl {
-    url = "mirror://sourceforge/docbook/${name}.tar.bz2";
-    sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
+  common = { pname, sha256 }: stdenv.mkDerivation rec {
+    name = "${pname}-1.78.1";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/docbook/${name}.tar.bz2";
+      inherit sha256;
+    };
+
+    buildPhase = "true";
+
+    installPhase =
+      ''
+        dst=$out/share/xml/${pname}
+        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
+        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;
+    };
   };
 
-  buildPhase = "true";
+in {
 
-  installPhase =
-    ''
-      dst=$out/share/xml/docbook-xsl
-      mkdir -p $dst
-      rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
-      mv * $dst/
+  docbook_xsl = common {
+    pname = "docbook-xsl";
+    sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
+  };
+
+  docbook_xsl_ns = common {
+    pname = "docbook-xsl-ns";
+    sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
+  };
 
-      # Backwards compatibility. Will remove eventually.
-      mkdir -p $out/xml/xsl
-      ln -s $dst $out/xml/xsl/docbook
-    '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ab994b5735..b8af711af71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10507,14 +10507,14 @@ let
 
   docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { };
 
-  docbook_xml_xslt = docbook_xsl;
+  inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { })
+    docbook_xsl
+    docbook_xsl_ns;
 
-  docbook_xsl = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl { };
+  docbook_xml_xslt = docbook_xsl;
 
   docbook5_xsl = docbook_xsl_ns;
 
-  docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { };
-
   dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
 
   eb-garamond = callPackage ../data/fonts/eb-garamond { };