This reverts commit 3ee2667e4c60c2ed850da8538cf135fe7f716f30. svn path=/nixpkgs/branches/stdenv-updates/; revision=32656