This reverts commit 8fcf025e5f80519a6f06c0b36aee007fe16a6e31. svn path=/nixpkgs/branches/stdenv-updates/; revision=32657