This reverts commit a9a2b1e0dd8cdbb1dff3253d303b35d41f29b0f9. svn path=/nixpkgs/branches/stdenv-updates/; revision=32652