Merge branch 'master' into staging-next

2018-08-31 17:32:48 +02:00
parent a9780a095b dde959a896
commit 93550cbddf
497 changed files with 2235 additions and 1360 deletions
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@

 with stdenv.lib;

-if ! lists.elem stdenv.system platforms.mesaPlatforms then
+if ! lists.elem stdenv.hostPlatform.system platforms.mesaPlatforms then
  throw "unsupported platform for Mesa"
 else