Patch supplied by Vladimír Čunát. Thanks. svn path=/nixpkgs/trunk/; revision=26648
svn path=/nixpkgs/trunk/; revision=26570
svn path=/nixpkgs/trunk/; revision=21107