diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-20 18:36:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-20 18:36:00 +0000 |
commit | 34a05e29f119bf06fe218b761b3999e4c7a87e65 (patch) | |
tree | 1cf7697ee6fc94493e88e71feaf9dfe17410cd6d /pkgs/games | |
parent | 274ec210155dd6051628a9b7e6b5583736ef486a (diff) | |
parent | 52770ccd46549bc3198f94e525561e9802eed4d5 (diff) | |
download | nixlib-34a05e29f119bf06fe218b761b3999e4c7a87e65.tar nixlib-34a05e29f119bf06fe218b761b3999e4c7a87e65.tar.gz nixlib-34a05e29f119bf06fe218b761b3999e4c7a87e65.tar.bz2 nixlib-34a05e29f119bf06fe218b761b3999e4c7a87e65.tar.lz nixlib-34a05e29f119bf06fe218b761b3999e4c7a87e65.tar.xz nixlib-34a05e29f119bf06fe218b761b3999e4c7a87e65.tar.zst nixlib-34a05e29f119bf06fe218b761b3999e4c7a87e65.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/ultrastardx/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 7b3390d9fda5..1d6f199480de 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -14,7 +14,7 @@ , SDL2_gfx , SDL2_mixer , SDL2_net, SDL2_ttf -, ffmpeg_3 +, ffmpeg , 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_3 + sqlite lua zlib libX11 libGLU libGL ffmpeg ]; in stdenv.mkDerivation rec { |