Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-01-24 00:09:45 +01:00
871 changed files with 3294 additions and 3821 deletions

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, config, fetchurl, pkg-config
, libGLSupported ? lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGL
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid