librsvg hooks itself into gdk-pixbuf and then uses gdk-pixbuf-thumbnailer
as the thumbnailer, extending its supported MIME type list.
Unfortunately, librsvg assumes the thumbnailer will be located in the same
bindir as librsvg binaries would, which is not true on Nix-powered systems.
This commit corrects the bindir path of the thumbnailer to the gdk_pixbuf
derivation.
GTK+ 2 is still our default, so packages should generally not depend
on GTK+ 3. For instance, this causes Emacs to depend on both GTK+ 2
and 3, which is obviously a bad thing.
Issue #8990.
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
* Moved some of the Gnome package Nix expressions into
pkgs/desktops/gnome/default.nix - no need to have them in separate
files. This way the code is much shorter. Still to be done for all
the other Gnome packages.
* Glib 2.16.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11855