This reverts commit 2a151d9df99f68c555a9f1fd2c80b8889561e9e3. svn path=/nixpkgs/branches/stdenv-updates/; revision=32659