This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9. svn path=/nixpkgs/branches/stdenv-updates/; revision=32653