Merge master into staging-next

2021-04-03 00:14:57 +00:00
parent b3a0328b7f 11910695f6
commit 74200a7126
60 changed files with 8100 additions and 2479 deletions
@@ -800,6 +800,10 @@ self: super:
    };
  });

+  xf86videoopenchrome = super.xf86videoopenchrome.overrideAttrs (attrs: {
+    buildInputs = attrs.buildInputs ++ [ self.libXv ];
+  });
+
  xf86videoxgi = super.xf86videoxgi.overrideAttrs (attrs: {
    patches = [
      # fixes invalid open mode