Merge staging-next into staging

2021-03-05 00:39:18 +00:00
parent 6d1958ad2d 75d6dd33bf
commit f696c7c887
14 changed files with 425 additions and 119 deletions
@@ -14,6 +14,7 @@
 , mesa
 , libxkbcommon
 , libappindicator-gtk3
+, libxshmfence
 }:

 version: hashes:
@@ -60,6 +61,7 @@ let
    [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
    ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
    ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
+    ++ optionals (! versionOlder version "12.0.0") [ libxshmfence ]
  );

  linux = {