Merging from trunk. I had to give away some structure to build the native

sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045

pkgs/misc/emulators/wine/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="1.1.32";
-   name="unnamed-package-1.1.32";
-   hash="0fzhdr7v3cq5n0k0f5vi65r6gr0ghg3vf34mxzzc8g3sx2zqvh05";
+   version="1.1.34";
+   name="wine-1.1.34";
+   hash="1llsm6h0s765n0s5nvr852iyml2ckdd7vq96dhqjlck5vr4nxsns";
    url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.32.tar.bz2";
+   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.34.tar.bz2";
   
   
 }

pkgs/misc/emulators/wine/src-info-for-default.nix

@@ -1,3 +1,4 @@
 {
   downloadPage = "http://www.winehq.org/";
+  baseName = "wine";
 }