This reverts commit af32fd6ce3.
af32fd6ce3
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25247