svn path=/nixpkgs/branches/xorg-7.5/; revision=18054
factor out the commonality. * Removed the "strip -S", which should not be needed anymore. * The enableOfficialBranding flag didn't do anything anymore. svn path=/nixpkgs/trunk/; revision=16166
svn path=/nixpkgs/trunk/; revision=16144
svn path=/nixpkgs/trunk/; revision=16143