Move libcroco and librsvg to top-level

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

3 files changed, 0 insertions, 32 deletions

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index f0c1006a1265..334bd5e7fc2c 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -81,11 +81,6 @@
 
   libwnck = callPackage ./desktop/libwnck { };
 
-  # Not part of GNOME desktop, but provides CSS support for librsvg
-  libcroco = callPackage ./desktop/libcroco { };
-
-  librsvg = callPackage ./desktop/librsvg { };
-
   libgweather = callPackage ./desktop/libgweather { };
 
   gvfs = callPackage ./desktop/gvfs { };
diff --git a/pkgs/desktops/gnome-2/desktop/libcroco/default.nix b/pkgs/desktops/gnome-2/desktop/libcroco/default.nix
deleted file mode 100644
index 99604475e625..000000000000
--- a/pkgs/desktops/gnome-2/desktop/libcroco/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libxml2, glib}:
-
-stdenv.mkDerivation {
-  name = "libcroco-0.6.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libcroco/0.6/libcroco-0.6.4.tar.xz;
-    sha256 = "1sij88na1skd4d5dx75l803fww3v9872q8m2hj6sjlkc839vl5n8";
-  };
-  buildInputs = [ pkgconfig libxml2 glib ];
-}
diff --git a/pkgs/desktops/gnome-2/desktop/librsvg/default.nix b/pkgs/desktops/gnome-2/desktop/librsvg/default.nix
deleted file mode 100644
index 86b818cd5a98..000000000000
--- a/pkgs/desktops/gnome-2/desktop/librsvg/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco}:
-
-stdenv.mkDerivation {
-  name = "librsvg-2.34.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/librsvg/2.34/librsvg-2.34.2.tar.xz;
-    sha256 = "0r24xr10chmz4l3ka2zy9c2245s7svzljbw9nrda3h44bcr03rsx";
-  };
-  buildInputs = [ libxml2 libgsf bzip2 libcroco ];
-  propagatedBuildInputs = [ glib gtk ];
-  buildNativeInputs = [ pkgconfig ];
-
-  # It tries to install the loader to $gdk_pixbuf
-  configureFlags = "--disable-pixbuf-loader";
-}