Warning: I have *not* built it locally, so the main purpose is to run the whole build on the build farm, hoping it won't fail. Feel free to fix or revert if it does. svn path=/nixpkgs/trunk/; revision=12622
svn path=/nixpkgs/trunk/; revision=9339