This reverts commit a74507f63e2af67cf64dc3e67bfbf2771120f67e. svn path=/nixpkgs/branches/stdenv-updates/; revision=32655