From 32e8236f36af02768d385a8e66b1bb0034663f65 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Sat, 14 Jun 2025 12:28:08 -0600 Subject: [PATCH] Squash merge dev into master --- home-manager/modules/ffmpeg.nix | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/home-manager/modules/ffmpeg.nix b/home-manager/modules/ffmpeg.nix index fcaf9c5..2aaeeba 100644 --- a/home-manager/modules/ffmpeg.nix +++ b/home-manager/modules/ffmpeg.nix @@ -1,25 +1,5 @@ -{pkgs, ...}: let - 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 { +{pkgs, ...}: { home.packages = [ - x11ffmpeg + (pkgs.ffmpeg-full.override {withXcb = true;}) ]; }