Merge remote-tracking branch 'upstream/master' into staging

2018-11-18 19:02:09 -06:00
parent e6f4f0ef8d 0925c482c8
commit 2c1d3a9a82
115 changed files with 2857 additions and 2270 deletions
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -148,8 +148,8 @@ let self = stdenv.mkDerivation {
    libffi libvdpau libelf libXvMC
    libpthreadstubs openssl/*or another sha1 provider*/
    valgrind-light python2 python2.pkgs.Mako
-  ] ++ lib.optionals stdenv.isLinux [ wayland wayland-protocols
-                                      libomxil-bellagio libva-minimal ];
+  ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
+    ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ];

  enableParallelBuilding = true;
  doCheck = false;