This commit breaks non-raspberrypi; just testing.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32371