Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-01-27 18:28:31 +00:00
committed by GitHub
62 changed files with 4992 additions and 5007 deletions
+1 -3
View File
@@ -1,10 +1,8 @@
{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper
{ lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper
, python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama
, libpcap, CoreAudioKit, ForceFeedback
, installShellFiles }:
with stdenv;
let
majorVersion = "0";
minorVersion = "226";