Move gnome-doc-utils and gtk-doc to top-level

Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252

3 files changed, 0 insertions, 53 deletions

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index c907a9058496..661311b3014c 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -56,8 +56,6 @@
 
   at_spi = callPackage ./platform/at-spi { };
 
-  gtk_doc = callPackage ./platform/gtk-doc { };
-
   gtkhtml = callPackage ./platform/gtkhtml { };
 
 
@@ -87,8 +85,6 @@
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 
-  gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { };
-
   zenity = callPackage ./desktop/zenity { };
 
   metacity = callPackage ./desktop/metacity { };
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
deleted file mode 100644
index 4953c8608189..000000000000
--- a/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool
-, makeWrapper, pythonPackages }:
-
-stdenv.mkDerivation {
-  name = "gnome-doc-utils-0.18.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-doc-utils/0.18/gnome-doc-utils-0.18.1.tar.bz2;
-    sha256 = "0psl9xnph6qga809dbkakjfp2z9mc32dxrdk8s6zn8whm41gc0gn";
-  };
-
-  configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ python libxml2Python libxslt ];
-  postInstall = "wrapPythonPrograms";
-
-  buildNativeInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
-}
diff --git a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
deleted file mode 100644
index c5086accc0db..000000000000
--- a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt
-, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex }:
-
-let version = "1.15"; in
-stdenv.mkDerivation {
-  name = "gtk-doc-${version}";
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtk-doc/${version}/gtk-doc-${version}.tar.bz2";
-    sha256 = "0ca8wh67nyh574ahlfkx8k9w2bm4ji9yzxvi3afsicqdpyx77k2r";
-  };
-
-  # maybe there is a better way to pass the needed dtd and xsl files
-  # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
-  preConfigure = ''
-    mkdir -p $out/nix-support
-    cat > $out/nix-support/catalog.xml << EOF
-    <?xml version="1.0"?>
-    <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-    <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-      <nextCatalog  catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" />
-      <nextCatalog  catalog="${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" />
-    </catalog>
-    EOF
-
-    configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper";
-  '';
-
-  buildInputs =
-   [ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 docbook_xsl
-     gnome_doc_utils dblatex
-   ];
-}