diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-09-02 20:18:38 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-09-04 08:44:19 +0000 |
commit | 16591184b42917969cf1d03afba950dbc571d1cb (patch) | |
tree | a7f98e30b809c53939daeabd6e94314cd4b3e13d /nixos/modules/config | |
parent | 46b6619cb39e7e4d68c61aab724157ba27a8f94d (diff) |
nixos/no-x-libs: remove X libs from ffmpeg
Prior to this change, ffmpeg couldn't be built for an environment.noXlibs system, because it would fail in: ffmpeg → SDL2 → libdecor ffmpeg certainly does not need support for SDL2 windowing on a noXlibs system. This fix is important because the minidlna NixOS test, which uses the minimal profile (and therefore environment.noXlibs) and ffmpeg, can't currently build.
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/no-x-libs.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 96bec4f8d2eb5..946c9bf38c470 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -30,6 +30,8 @@ with lib; beam = super.beam_nox; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; + ffmpeg_4 = super.ffmpeg_4.override { sdlSupport = false; vdpauSupport = false; }; + ffmpeg_5 = super.ffmpeg_5.override { sdlSupport = false; vdpauSupport = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; libva = super.libva-minimal; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; |