From 16591184b42917969cf1d03afba950dbc571d1cb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Sep 2022 20:18:38 +0000 Subject: [PATCH] nixos/no-x-libs: remove X libs from ffmpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- nixos/modules/config/no-x-libs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 96bec4f8d2eb..946c9bf38c47 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; };