I hoped this update would fix the build errors, but in fact it didn't. :-( svn path=/nixpkgs/trunk/; revision=32518