This reverts commit a513314290ba0d78400ea4902301f421e0fecdd2. svn path=/nixpkgs/branches/stdenv-updates/; revision=32642