diff options
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/flightgear/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/games/gemrb/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/games/speed-dreams/default.nix | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index b7a4af54929d..f3b77d87e179 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,14 +6,14 @@ }: let - version = "2017.3.1"; - shortVersion = "2017.3"; + version = "2018.2.2"; + shortVersion = "2018.2"; data = stdenv.mkDerivation rec { name = "flightgear-base-${version}"; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "166q0fsbp17lx1l1n6i8cfk3d1i79pasz1liya09z6m2i1pb026z"; + sha256 = "c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4"; }; phases = [ "installPhase" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "1kccf91vmxnzyki6grx09s10dvr4j6qrz34ikj7jn81g5scisbkg"; + sha256 = "61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147"; }; # Of all the files in the source and data archives, there doesn't seem to be diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 0e9025259224..fc7bf7168ddf 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake -, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis }: +, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis +, libiconv }: stdenv.mkDerivation rec { name = "gemrb-${version}"; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { }; # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional - buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis ]; + buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 4bf03fec9de9..5f6e20c39b6b 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { tar -xf ${wip-cars-and-tracks} ''; + prePatch = '' + # https://sourceforge.net/p/speed-dreams/mailman/message/35665539/ + sed -i "s|lastSlash = '\\\0'|lastSlash = NULL|" src/libs/tgf/params.cpp + sed -i "s|const char\* error = '\\\0'|const char\* error = NULL|" src/libs/tgfclient/openalmusicplayer.cpp + ''; + preBuild = '' make -C src/libs/portability make -C src/libs/portability portability.o |