This patch no longer applies to `master' and may be unnecessary now. svn path=/nixpkgs/trunk/; revision=18936
svn path=/nixpkgs/trunk/; revision=18907
svn path=/nixpkgs/trunk/; revision=17994