diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-06-07 15:39:09 +0300 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-06-12 11:55:31 -0700 |
commit | 01d4e2fe332420684803170597d1b88e9f826303 (patch) | |
tree | 0a998e2bf5326595ec4a1fcffad7bfd963760dad /pkgs/games | |
parent | 8e1dcea3d575dfd4ecdee336e5b95c093f3017cb (diff) | |
download | nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.gz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.bz2 nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.lz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.xz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.zst nixlib-01d4e2fe332420684803170597d1b88e9f826303.zip |
treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that used `ffmpeg` without requiring a specific version now use ffmpeg_3 explicitly so they shouldn't change.
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/chiaki/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/hedgewars/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/openmw/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/openrw/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/privateer/default.nix | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 0d0bab2c4ebe..ac228118444a 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf +, cmake, ffmpeg_3, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf , python3Packages, SDL2 }: mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf ]; - buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; + buildInputs = [ ffmpeg_3 libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; doCheck = true; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 771554192d80..00df6f338210 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut +{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut , lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools @@ -27,7 +27,7 @@ mkDerivation rec { buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image fpc lua5_1 - ffmpeg freeglut physfs + ffmpeg_3 freeglut physfs qtbase ] ++ lib.optional withServer ghc; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index a9047de70416..cae97dc42158 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg +{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 , boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: let @@ -24,7 +24,7 @@ in mkDerivationWith stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ffmpeg bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; + buildInputs = [ cmake boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; cmakeFlags = [ "-DDESIRED_QT_VERSION:INT=5" diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index c2bb5cfa20ce..b53850a87438 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal -, SDL2, boost, ffmpeg, Cocoa, OpenAL }: +, SDL2, boost, ffmpeg_3, Cocoa, OpenAL }: stdenv.mkDerivation { version = "2019-10-26"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg + sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with stdenv.lib; { diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 9fd90945ebad..16d0036b6583 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, +{ stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, libXmu, libGLU, libGL, openal, pixman, pkgconfig, python27, SDL }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = - [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng + [ boost cmake ffmpeg_3 freeglut glib gtk2 libjpeg libpng libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal pixman pkgconfig python27 SDL ]; |