This reverts commit 9bc390eb7b9bcbe8b4951797010efd27afbe7afd. svn path=/nixpkgs/branches/stdenv-updates/; revision=32661