Merge branch 'master' into staging-next

Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ];

-  # Work around build failures on recent GTK+.
+  # Work around build failures on recent GTK.
  # See http://ubuntuforums.org/showthread.php?p=10535837
  NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE";