Merge master into staging-next

2021-03-15 00:40:27 +00:00
parent c7b23f6440 4908c65935
commit 8fa4dca9b5
42 changed files with 412 additions and 220 deletions
@@ -143,10 +143,10 @@ in buildFHSUserEnv rec {
    vulkan-loader
    expat
    wayland
-    xlibs.libxcb
-    xlibs.libXdamage
-    xlibs.libxshmfence
-    xlibs.libXxf86vm
+    xorg.libxcb
+    xorg.libXdamage
+    xorg.libxshmfence
+    xorg.libXxf86vm
    llvm_11.lib
    libelf
  ] ++ (if (!nativeOnly) then [