Merge master into staging-next

2021-05-22 00:56:03 +00:00
parent 0841bba38a b4fd56d50b
commit 901fb5e64e
87 changed files with 3511 additions and 1315 deletions
@@ -1,6 +1,6 @@
 { lib, stdenv, makeDesktopItem, fetchurl, unzip
 , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome
-, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa
+, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon
 }:

 stdenv.mkDerivation rec {
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
    udev
    libX11
    libxcb
+    libxshmfence
+    libxkbcommon
    libXi
    libXcursor
    libXdamage