Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-02-20 00:36:40 +00:00
committed by GitHub
93 changed files with 2835 additions and 1177 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 imlib2 ]
++ lib.optional enableXinerama libXinerama;
buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ;
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ;
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];