Skip to content

hedgewars: add patch for FFmpeg ≥ 6 #336169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpletz merged 1 commit into from
Aug 21, 2024
Merged

hedgewars: add patch for FFmpeg ≥ 6 #336169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkgs/games/hedgewars/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_4, libglut
{ stdenv, SDL2_image_2_6, SDL2_ttf, SDL2_net, fpc, haskell, ffmpeg_7, libglut
, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools, wrapQtAppsHook
Expand All @@ -21,13 +21,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-IB/l5FvYyls9gbGOwGvWu8n6fCxjvwGQBeL4C+W88hI=";
};

patches = [
# Add support for ffmpeg 6.0
# https://github.com/hedgewars/hw/pull/74
./support-ffmpeg-6.patch
];

nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];

buildInputs = [
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image_2_6
fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg_4 libglut physfs
ffmpeg_7 libglut physfs
qtbase
] ++ lib.optional withServer ghc;

Expand Down
Loading