public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121851 from mayflower/hedgewars-ffmpeg4

Browse Source 
hedgewars: use ffmpeg 4
This commit is contained in:
Maximilian Bosch 2021-05-06 23:07:27 +02:00 committed by GitHub
commit 730ec2ac89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/hedgewars/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut { mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs , zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools , qtbase, qttools
@ -29,7 +29,7 @@ mkDerivation rec {
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
fpc lua5_1 fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg_3 freeglut physfs ffmpeg freeglut physfs
qtbase qtbase
] ++ lib.optional withServer ghc; ] ++ lib.optional withServer ghc;