Merge branch 'staging' into staging-next

A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
parent 3257feac49 25ae1fd29f
commit d2eb7a7887
675 changed files with 5919 additions and 3687 deletions
@@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
  buildInputs = [
    gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file
+    xorg.libXxf86vm
  ];

  dynarecTarget =