From d269f093b1d416ae729db3cbddf441ae127a4374 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Thu, 13 Nov 2025 18:14:41 +0000 Subject: [PATCH] wine: add ffmpeg as dependency version 9.18 added ffmpeg as a dependency. Reference: https://gitlab.winehq.org/wine/wine/-/releases/wine-9.18 --- pkgs/applications/emulators/wine/base.nix | 3 +++ pkgs/applications/emulators/wine/default.nix | 2 ++ pkgs/top-level/wine-packages.nix | 1 + 3 files changed, 6 insertions(+) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 9ac68c4ffcea..02fc066447b3 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -195,6 +195,9 @@ stdenv.mkDerivation ( libgbm ] ) + ++ lib.optionals ffmpegSupport [ + pkgs.ffmpeg-headless + ] ) ); diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 605f327a5f6b..acc89c0ee11a 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -42,6 +42,7 @@ mingwSupport ? stdenv.hostPlatform.isDarwin, waylandSupport ? false, x11Support ? false, + ffmpegSupport ? false, embedInstallers ? false, # The Mono and Gecko MSI installers moltenvk, # Allow users to override MoltenVK easily }: @@ -83,6 +84,7 @@ let vulkanSupport waylandSupport x11Support + ffmpegSupport xineramaSupport ; }; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 2656241d4acd..627b190bf5d9 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -33,6 +33,7 @@ rec { usbSupport = true; waylandSupport = stdenv.hostPlatform.isLinux; x11Support = stdenv.hostPlatform.isLinux; + ffmpegSupport = true; }; full = base.override {