This also fixes build failure related to docbook versions. svn path=/nixpkgs/trunk/; revision=25190
svn path=/nixpkgs/trunk/; revision=24901
svn path=/nixpkgs/trunk/; revision=24092