Merge master into x-updates
libxklavier: update 5.0 -> 5.3 (after a long time)
xorg: update, regenerate (new: glamor-egl)

Updates caught by nixpkgs monitor.
xorg: fixup after the update

All that built before update builds now again (and glamor-egl is new).
nixos ati: support glamor, disabled by default

This is from @ambrop72 #1969.
mesa: major update to 10.0.4, seems to work finally
gtk2: bugfix update 2.24.22 -> .23
harfbuzz: minor update 0.9.26 -> .27
xorg.libFS: maintenance update 1.0.5 -> .6
automake: update from 1.12.4 to 1.12.6
Merge branch master into x-updates (fix eval)
libjpeg(_turbo): minor update 1.3.0 -> .1

The security patch got incorporated into the release.
mesa: add symlinks from $out/lib/*.so to $drivers/lib

This is mainly in order for libGL to be present in /run/opengl-drivers{,-32}.
Now even with mesa drivers pkgs will use your current nixos libGL
instead of the one it was built against.

Thanks to @iElectric for suggesting this change.
xorg: add "intel-testing" video driver, currently 2.99.911
superTuxKart: fix build with newer mesa

The idea is taken from Arch.
gdk_pixbuf: minor update
gtk+3 core stack: update to 3.12
Merge master into x-updates
xorg.xf86-video-vmware: minor update

Patch no longer needed to build.
libgsf: maintenance update to fix build with new glib