diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/eduke32/default.nix | 13 | ||||
-rw-r--r-- | pkgs/games/ferium/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/fheroes2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/flightgear/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/keeperrl/default.nix | 38 | ||||
-rw-r--r-- | pkgs/games/lgames/barrage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/speed-dreams/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/super-tux-kart/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/terraria-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/tuxpaint/default.nix | 10 |
10 files changed, 59 insertions, 35 deletions
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 38bfed7ca7d82..d5656d0d5c3bf 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20210910"; - rev = "9603"; - revExtra = "6c289cce4"; + version = "20221026"; + rev = "10165"; + revExtra = "a9c797dcb"; src = fetchurl { url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "sha256-/NQMsmT9z2N3KWBrP8hlGngQKJUgSP+vrNoFqJscRCk="; + sha256 = "sha256-8xvIe+kVOu2VIZACHis04tvyrl1IRrt0tY8D04n6ZjU="; }; buildInputs = [ @@ -56,6 +56,11 @@ in stdenv.mkDerivation rec { substituteInPlace source/glad/src/$f \ --replace libGL.so ${libGL}/lib/libGL.so done + + substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ + --replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \ + --replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \ + --replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>' ''; makeFlags = [ diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 7fc79f8be4389..60cf85ddfb570 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pJis4Lab/qRc5taeTxSoJOvNrhsWhGJrPILvkmB8k2A="; + sha256 = "sha256-tRJwx+yOzgy5SkVPtE2w4bhFSIaZUxXO4FBrZdhyz7g="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-J1BY0gSkUQRFZJ/UlikvQqrLvCjHlf2jxbg6BIoZZUE="; + cargoSha256 = "sha256-zfA+kCqfyI+zNleOHWAYGLePy5FHSw05xIcWRT8BHbY="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 628ebcb28ab28..7d3123b3eb93d 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.20"; + version = "0.9.21"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-IF8ESbMDvermghBGLMq+GdE67Hg5XedX0REGGnWQhRA="; + sha256 = "sha256-b4OAuwMgVgZUdLWJp6Rv/+1X+rPcG7piIBk8SlEXoUY="; }; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index c927bc9fb4314..bf94dfa067f65 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -2,7 +2,7 @@ , freeglut, freealut, libGLU, libGL, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xorgproto, libXext, libXi , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr -, makeDesktopItem, qtbase, qtdeclarative, glew +, makeDesktopItem, qtbase, qtdeclarative, glew, curl }: let @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { freeglut freealut libGLU libGL libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xorgproto libXext libXi libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase - glew qtdeclarative + glew qtdeclarative curl ]; postInstall = '' diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index f1c0f1712629d..94eeb46376a65 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, requireFile -, openal, curl, libogg, libvorbis -, SDL2, SDL2_image, zlib +{ lib +, stdenv +, fetchFromGitHub +, requireFile +, openal +, curl +, libogg +, libvorbis +, SDL2 +, SDL2_image +, zlib +, clang +, libtheora , unfree_assets ? false }: stdenv.mkDerivation rec { pname = "keeperrl"; - version = "alpha28"; + version = "alpha34"; free-src = fetchFromGitHub { owner = "miki151"; repo = "keeperrl"; rev = version; - sha256 = "0isj8ijn5a89m2r5cxk4lcsq0cydx7c0h87vgr8v5cndm3rd27cy"; + sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE="; }; assets = if unfree_assets then requireFile rec { @@ -28,7 +38,7 @@ stdenv.mkDerivation rec { "nix-prefetch-url file://\$PWD/${name}". ''; - sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nk53"; + sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll"; } else null; sourceRoot = "source"; @@ -40,7 +50,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - openal curl libogg libvorbis SDL2 SDL2_image zlib + openal curl libogg libvorbis libtheora SDL2 SDL2_image zlib clang ]; NIX_CFLAGS_COMPILE = [ @@ -49,11 +59,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "OPT=true" - "RELEASE=true" - "DATA_DIR=$(out)/share" - "ENABLE_LOCAL_USER_DIR=true" - ]; + makeFlags = [ + "OPT=true" + "RELEASE=true" + "DATA_DIR=$(out)/share" + "ENABLE_LOCAL_USER_DIR=true" + "NO_STEAMWORKS=true" + ]; installPhase = '' install -Dm755 keeper $out/bin/keeper @@ -68,7 +80,7 @@ stdenv.mkDerivation rec { description = "A dungeon management rogue-like"; homepage = "https://keeperrl.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ onny ]; # TODO: Add OS X platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/games/lgames/barrage/default.nix index 70f97b591001b..343affcc90f8f 100644 --- a/pkgs/games/lgames/barrage/default.nix +++ b/pkgs/games/lgames/barrage/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "barrage"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-p4iXq2qM9tU9QJO7irriBN36OiLFyrnnYiDkmH3naQQ="; + hash = "sha256-nFkkzT5AjcPfXsdxwvEsk4+RX9Py1mVqADvuoxE4Ha4="; }; buildInputs = [ diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index b97e755b27530..d06e3c1aa1588 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -56,6 +56,9 @@ stdenv.mkDerivation rec { done ''; + # RPATH of binary /nix/store/.../lib64/games/speed-dreams-2/drivers/shadow_sc/shadow_sc.so contains a forbidden reference to /build/ + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libpng libGLU libGL freeglut libX11 plib openal freealut libXrandr xorgproto diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 248db620fe118..b20d00a8da4e4 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -24,6 +24,7 @@ , Cocoa , IOKit , libsamplerate +, shaderc }: let assets = fetchsvn { @@ -48,6 +49,8 @@ let "graphics_engine" # Internal library of STK, nothing to do about it "graphics_utils" + # Internal library. + "simd_wrapper" # This irrlicht is bundled with cmake # whereas upstream irrlicht still uses # archaic Makefiles, too complicated to switch to. @@ -65,13 +68,13 @@ in stdenv.mkDerivation rec { pname = "supertuxkart"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; rev = version; - sha256 = "1llyxkdc4m9gnjxqaxlpwvv3ayvpw2bfjzfkkrljaxhznq811g0l"; + hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM="; }; postPatch = '' @@ -91,6 +94,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + shaderc SDL2 glew libvorbis diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 0c7beaf5e0db4..9a216cefdbce2 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.4.4.2"; + version = "1.4.4.8.1"; urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; - sha256 = "sha256-kRqLnrLuv9hgaGcOaTQmS7auozZcEZmXmE/qcD+wRWA="; + sha256 = "sha256-4mM9+iE2HJnzoW4mvet3sy0mngQ62dxhxa1eDJxBGBo="; }; buildInputs = [ file ]; diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 638fa170f50fd..e03079bf60dd9 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.27"; + version = "0.9.28"; pname = "tuxpaint"; src = fetchurl { - url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-qyuA6J34gijNDsCmyQtJ1UPLFXqjj7kMvTop8AFAVXo="; + url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}-sdl1.tar.gz"; + sha256 = "sha256-b4Ru9GqyGf2jMmM24szGXO2vbSxCwvPmA6tgEUWhhos="; }; nativeBuildInputs = [ @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { # stamps stamps = fetchurl { - url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2021-11-25/tuxpaint-stamps-2021.11.25.tar.gz"; - sha256 = "sha256-y1XuIbLSW0QO4has+rC7jZBq8cma28d+jbEe7DBYnVI="; + url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2022-06-04/tuxpaint-stamps-2022.06.04.tar.gz"; + sha256 = "sha256-hCBlV2+uVUNY4A5R1xpJJhamSQsStZIigGdHfCh6C/g="; }; postInstall = '' |