mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
ultrastardx: use ffmpeg_3 instead of ffmpeg_2
This commit is contained in:
parent
48377fde76
commit
ed42bcb6ff
2 changed files with 3 additions and 5 deletions
|
@ -14,7 +14,7 @@
|
|||
, SDL2_gfx
|
||||
, SDL2_mixer
|
||||
, SDL2_net, SDL2_ttf
|
||||
, ffmpeg
|
||||
, ffmpeg_3
|
||||
, sqlite
|
||||
, zlib
|
||||
, libX11
|
||||
|
@ -26,7 +26,7 @@ let
|
|||
sharedLibs = [
|
||||
pcre portaudio freetype
|
||||
SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf
|
||||
sqlite lua zlib libX11 libGLU libGL ffmpeg
|
||||
sqlite lua zlib libX11 libGLU libGL ffmpeg_3
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
|
|
@ -28312,9 +28312,7 @@ in
|
|||
|
||||
ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
|
||||
|
||||
ultrastardx = callPackage ../games/ultrastardx {
|
||||
ffmpeg = ffmpeg_2;
|
||||
};
|
||||
ultrastardx = callPackage ../games/ultrastardx { };
|
||||
|
||||
unciv = callPackage ../games/unciv { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue