Squash merge dev into master

home-manager/modules/ffmpeg.nix

@@ -1,25 +1,5 @@
-{pkgs, ...}: let
+{pkgs, ...}: {
-  x11ffmpeg = pkgs.ffmpeg-full.overrideAttrs (old: {
-    buildInputs =
-      (old.buildInputs or [])
-      ++ [
-        pkgs.xorg.libxcb
-        pkgs.xorg.libX11
-        pkgs.xorg.xcbutil
-        pkgs.xorg.xcbutilimage
-        pkgs.xorg.xcbutilkeysyms
-        pkgs.xorg.xcbutilwm
-      ];
-    configureFlags =
-      (old.configureFlags or [])
-      ++ [
-        "--enable-libxcb"
-        "--enable-libxcb-shm"
-        "--enable-libxcb-xfixes"
-      ];
-  });
-in {
   home.packages = [
-    x11ffmpeg
+    (pkgs.ffmpeg-full.override {withXcb = true;})
   ];
 }