This reverts commit daa626efe76d8602c7892aaa338d526ea88bfe1b. svn path=/nixpkgs/branches/stdenv-updates/; revision=32658