* e2fsprogs updated to 1.41.6. Also keep the previous version around

so that we don't have to rebuild everything that depends on libuuid
  (such as all X programs).

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

pkgs/servers/x11/xorg/default.nix

@@ -614,8 +614,8 @@ let
       url = mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2;
       sha256 = "10iap6ydxmk0g5qcfnsf9yc30fhvqshgppm0sca21y0z5qwaqdkm";
     };
-    buildInputs = [pkgconfig libICE e2fsprogs xproto xtrans ];
-  })) // {inherit libICE e2fsprogs xproto xtrans ;};
+    buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
+  })) // {inherit libICE libuuid xproto xtrans ;};
     
   libWindowsWM = (stdenv.mkDerivation ((if overrides ? libWindowsWM then overrides.libWindowsWM else x: x) {
     name = "libWindowsWM-1.0.0";

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

@@ -26,7 +26,7 @@ $pcMap{$_} = $_ foreach @missingPCs;
 $pcMap{"freetype2"} = "freetype";
 $pcMap{"libpng12"} = "libpng";
 $pcMap{"dbus-1"} = "dbus";
-$pcMap{"uuid"} = "e2fsprogs";
+$pcMap{"uuid"} = "libuuid";
 $pcMap{"gl"} = "mesa";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "renderproto";