svn path=/nixpkgs/trunk/; revision=24945
As a side effect, I add openjpeg and jbig2dec. svn path=/nixpkgs/trunk/; revision=23069