This reverts commit 92b56e5686b06237c23ba41b6b8918ea643781dc. svn path=/nixpkgs/branches/stdenv-updates/; revision=32674