Merge master into staging-next

2021-03-15 18:16:46 +00:00
parent dec95bae4a 529607debb
commit 4915d2cb4c
38 changed files with 747 additions and 581 deletions
@@ -184,6 +184,7 @@ rec {
      # libraries not on the upstream include list, but nevertheless expected
      # by at least one appimage
      libtool.lib # for Synfigstudio
+      xorg.libxshmfence # for apple-music-electron
      at-spi2-core
    ];
  };