Squash merge dev into master
This commit is contained in:
parent
298fcf8f32
commit
32e8236f36
1 changed files with 2 additions and 22 deletions
|
|
@ -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;})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue