This reverts commit 1ac12b0d4b64936104cb6031b02c92c3d1845ae5. svn path=/nixpkgs/branches/stdenv-updates/; revision=32654