* Some renaming.

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

31 files changed, 4 insertions, 4 deletions

diff --git a/pkgs/development/libraries/gtk+-1/default.nix b/pkgs/development/libraries/gtk-libs-1.x/default.nix
index 0e86abd788b59..0e86abd788b59 100644
--- a/pkgs/development/libraries/gtk+-1/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
index d8d354962e9c6..d8d354962e9c6 100644
--- a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/glib/default.nix b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
index f8990f5ce847c..f8990f5ce847c 100644
--- a/pkgs/development/libraries/gtk+-1/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh b/pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh
index 9c1af29b65e5a..9c1af29b65e5a 100644
--- a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh
+++ b/pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
index 7762ee57b77e4..7762ee57b77e4 100644
--- a/pkgs/development/libraries/gtk+-1/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk+/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
index 36afb1fb13d96..36afb1fb13d96 100644
--- a/pkgs/development/libraries/gtk+/atk/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/atk/default.nix
diff --git a/pkgs/development/libraries/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.4/default.nix
index dc01a534d814f..dc01a534d814f 100644
--- a/pkgs/development/libraries/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/default.nix
diff --git a/pkgs/development/libraries/gtk+/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
index dcaff4a99d29e..dcaff4a99d29e 100644
--- a/pkgs/development/libraries/gtk+/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
diff --git a/pkgs/development/libraries/gtk+/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
index 94eab65ffa9c4..94eab65ffa9c4 100644
--- a/pkgs/development/libraries/gtk+/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk+/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
index ef4f6525b9710..ef4f6525b9710 100644
--- a/pkgs/development/libraries/gtk+/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/pango/default.nix
diff --git a/pkgs/development/libraries/freedesktop/default.nix b/pkgs/development/libraries/xlibs/default.nix
index f7d86e741eea7..f7d86e741eea7 100644
--- a/pkgs/development/libraries/freedesktop/default.nix
+++ b/pkgs/development/libraries/xlibs/default.nix
diff --git a/pkgs/development/libraries/freedesktop/fontconfig/builder.sh b/pkgs/development/libraries/xlibs/fontconfig/builder.sh
index 48c1d5e23d3cf..48c1d5e23d3cf 100644
--- a/pkgs/development/libraries/freedesktop/fontconfig/builder.sh
+++ b/pkgs/development/libraries/xlibs/fontconfig/builder.sh
diff --git a/pkgs/development/libraries/freedesktop/fontconfig/default.nix b/pkgs/development/libraries/xlibs/fontconfig/default.nix
index b9dbd564b8e0c..b9dbd564b8e0c 100644
--- a/pkgs/development/libraries/freedesktop/fontconfig/default.nix
+++ b/pkgs/development/libraries/xlibs/fontconfig/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libICE/default.nix b/pkgs/development/libraries/xlibs/libICE/default.nix
index daf4043215f1e..daf4043215f1e 100644
--- a/pkgs/development/libraries/freedesktop/libICE/default.nix
+++ b/pkgs/development/libraries/xlibs/libICE/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libSM/default.nix b/pkgs/development/libraries/xlibs/libSM/default.nix
index 605749d764b27..605749d764b27 100644
--- a/pkgs/development/libraries/freedesktop/libSM/default.nix
+++ b/pkgs/development/libraries/xlibs/libSM/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libX11/default.nix b/pkgs/development/libraries/xlibs/libX11/default.nix
index b1b4512557ae8..b1b4512557ae8 100644
--- a/pkgs/development/libraries/freedesktop/libX11/default.nix
+++ b/pkgs/development/libraries/xlibs/libX11/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXau/default.nix b/pkgs/development/libraries/xlibs/libXau/default.nix
index 1742ed793fe41..1742ed793fe41 100644
--- a/pkgs/development/libraries/freedesktop/libXau/default.nix
+++ b/pkgs/development/libraries/xlibs/libXau/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXaw/default.nix b/pkgs/development/libraries/xlibs/libXaw/default.nix
index b4649a9e828fd..b4649a9e828fd 100644
--- a/pkgs/development/libraries/freedesktop/libXaw/default.nix
+++ b/pkgs/development/libraries/xlibs/libXaw/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXext/default.nix b/pkgs/development/libraries/xlibs/libXext/default.nix
index 5226e0601c255..5226e0601c255 100644
--- a/pkgs/development/libraries/freedesktop/libXext/default.nix
+++ b/pkgs/development/libraries/xlibs/libXext/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXft/default.nix b/pkgs/development/libraries/xlibs/libXft/default.nix
index faaabc32a2bad..faaabc32a2bad 100644
--- a/pkgs/development/libraries/freedesktop/libXft/default.nix
+++ b/pkgs/development/libraries/xlibs/libXft/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXmu/default.nix b/pkgs/development/libraries/xlibs/libXmu/default.nix
index 963fa0e858df8..963fa0e858df8 100644
--- a/pkgs/development/libraries/freedesktop/libXmu/default.nix
+++ b/pkgs/development/libraries/xlibs/libXmu/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXpm/default.nix b/pkgs/development/libraries/xlibs/libXpm/default.nix
index ba17158ab4a2e..ba17158ab4a2e 100644
--- a/pkgs/development/libraries/freedesktop/libXpm/default.nix
+++ b/pkgs/development/libraries/xlibs/libXpm/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXrender/default.nix b/pkgs/development/libraries/xlibs/libXrender/default.nix
index 28d8ae6a5aaba..28d8ae6a5aaba 100644
--- a/pkgs/development/libraries/freedesktop/libXrender/default.nix
+++ b/pkgs/development/libraries/xlibs/libXrender/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXt/default.nix b/pkgs/development/libraries/xlibs/libXt/default.nix
index c06b4522451bd..c06b4522451bd 100644
--- a/pkgs/development/libraries/freedesktop/libXt/default.nix
+++ b/pkgs/development/libraries/xlibs/libXt/default.nix
diff --git a/pkgs/development/libraries/freedesktop/libXtrans/default.nix b/pkgs/development/libraries/xlibs/libXtrans/default.nix
index a3e03d5c43266..a3e03d5c43266 100644
--- a/pkgs/development/libraries/freedesktop/libXtrans/default.nix
+++ b/pkgs/development/libraries/xlibs/libXtrans/default.nix
diff --git a/pkgs/development/libraries/freedesktop/renderext/default.nix b/pkgs/development/libraries/xlibs/renderext/default.nix
index ba2ece319748d..ba2ece319748d 100644
--- a/pkgs/development/libraries/freedesktop/renderext/default.nix
+++ b/pkgs/development/libraries/xlibs/renderext/default.nix
diff --git a/pkgs/development/libraries/freedesktop/xextensions/default.nix b/pkgs/development/libraries/xlibs/xextensions/default.nix
index cd309ddb49d25..cd309ddb49d25 100644
--- a/pkgs/development/libraries/freedesktop/xextensions/default.nix
+++ b/pkgs/development/libraries/xlibs/xextensions/default.nix
diff --git a/pkgs/development/libraries/freedesktop/xlibs/builder.sh b/pkgs/development/libraries/xlibs/xlibs/builder.sh
index abcab635a6082..abcab635a6082 100644
--- a/pkgs/development/libraries/freedesktop/xlibs/builder.sh
+++ b/pkgs/development/libraries/xlibs/xlibs/builder.sh
diff --git a/pkgs/development/libraries/freedesktop/xlibs/default.nix b/pkgs/development/libraries/xlibs/xlibs/default.nix
index 4c8475c21e71a..4c8475c21e71a 100644
--- a/pkgs/development/libraries/freedesktop/xlibs/default.nix
+++ b/pkgs/development/libraries/xlibs/xlibs/default.nix
diff --git a/pkgs/development/libraries/freedesktop/xproto/default.nix b/pkgs/development/libraries/xlibs/xproto/default.nix
index 8793a663fbc5e..8793a663fbc5e 100644
--- a/pkgs/development/libraries/freedesktop/xproto/default.nix
+++ b/pkgs/development/libraries/xlibs/xproto/default.nix
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index cf0997ba8537d..91579aca3aa96 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -383,12 +383,12 @@ rec {
             docbook_xml_dtd perlXMLParser;
   };
 
-  gtkLibs = import ../development/libraries/gtk+ {
+  gtkLibs = import ../development/libraries/gtk-libs-2.4 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;
   };
 
-  gtkLibs1 = import ../development/libraries/gtk+-1 {
+  gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
     inherit fetchurl stdenv x11 libtiff libjpeg libpng;
   };
 
@@ -450,7 +450,7 @@ rec {
     inherit fetchurl stdenv zlib;
   };
 
-  xlibs = (import ../development/libraries/freedesktop) {
+  xlibs = (import ../development/libraries/xlibs) {
     inherit fetchurl stdenv pkgconfig freetype expat;
   };
 
@@ -541,7 +541,7 @@ rec {
 
   sylpheed = (import ../applications/networking/mailreaders/sylpheed) {
     inherit fetchurl stdenv openssl;
-    inherit (gtkLibs1) gtk gdkpixbuf;
+    inherit (gtkLibs1x) gtk gdkpixbuf;
     sslSupport = true;
     imageSupport = true;
   };