This reverts commit f067ecb4911f154fe2c64434abdc5a8b79625f5a. svn path=/nixpkgs/branches/stdenv-updates/; revision=32644