Unverified Commit d4f119b4 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

wine: add ffmpeg as dependency (#461324)

parents 3fea61a8 d269f093

pkgs/applications/emulators/wine/base.nix

+3 −0
Original line number Diff line number Diff line
@@ -188,6 +188,9 @@ stdenv.mkDerivation ( 
            libgbm

          ]

        )

        ++ lib.optionals ffmpegSupport [

          pkgs.ffmpeg-headless

        ]

      )

    );

pkgs/applications/emulators/wine/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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

            ;

        };

pkgs/top-level/wine-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ rec { 
    usbSupport = true;

    waylandSupport = stdenv.hostPlatform.isLinux;

    x11Support = stdenv.hostPlatform.isLinux;

    ffmpegSupport = true;

  };



  full = base.override {