Merge staging-next into staging

2020-07-22 16:50:25 +02:00
parent 68bd1c8552 19be541fe7
commit df0eab2726
190 changed files with 12545 additions and 766 deletions
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -84,6 +84,7 @@ rec {

      gst_all_1.gstreamer
      gst_all_1.gst-plugins-ugly
+      gst_all_1.gst-plugins-base
      libdrm
      xorg.xkeyboardconfig
      xorg.libpciaccess
@@ -163,7 +164,6 @@ rec {
      SDL2_ttf
      SDL2_mixer
      gstreamer
-      gst-plugins-base
      libappindicator-gtk2
      libcaca
      libcanberra