Merge branch 'master' into staging

That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
parent dc5bbc4700 0e54c74911
commit 0b192a0976
206 changed files with 25329 additions and 3237 deletions
@@ -45,6 +45,7 @@ stdenv.mkDerivation {

  patches = [
    ./glx_ro_text_segm.patch # fix for grsecurity/PaX
+    ./symlink-drivers.patch
   # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu),
   #  as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
  ] ++ optional stdenv.isLinux