This reverts commit a9873e9412d5ffb333baaf33502c8dff62548fa6. svn path=/nixpkgs/branches/stdenv-updates/; revision=32651