svn path=/nixpkgs/branches/stdenv-updates/; revision=32586
based on a patch by Cillian de Róiste svn path=/nixpkgs/branches/stdenv-updates/; revision=32583