Patch submitted by Jan Malakhovski <oxij@oxij.org>.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25296