diff options
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/bugdom/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/ferium/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/opensoldat/default.nix (renamed from pkgs/games/soldat-unstable/default.nix) | 32 | ||||
| -rw-r--r-- | pkgs/games/soldat-unstable/gamenetworkingsockets-no-external.patch | 14 |
4 files changed, 19 insertions, 37 deletions
diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index d1cadd04be05d..75bcad2f0db17 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bugdom"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256-rhbsVgAkDdRJxbCCzJbsy5TbVdmP7MFqz+7nELiN4Yw="; + sha256 = "sha256-pgms2mipW1zol35LVCuU5+7mN7CBiVGFvu1CJ3CrGU0="; fetchSubmodules = true; }; diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index b542ae3451e74..11ba016adb347 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.1.1"; + version = "4.1.5"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "5DYdeK6JdA7oLBkjP3WkwLwlBitdf4Yt2dNP7P0INN0="; + sha256 = "sha256-NxrV8mi7xsr+x9oOp78DkHoPls0JLm5eol/8q9NwuTs="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "7rpxHfe+pWarPJ72WSXjgr63YctZ5+RrsEgmw7o66VI="; + cargoSha256 = "sha256-hR2PKQqSvtSBOOhZKW2IsGGjuU4jCdLMeruAHxErQtU="; buildNoDefaultFeatures = true; # by default pulls in GTK 3 just for its directory picker diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/opensoldat/default.nix index b3ae3b58cfe76..625fc0dce5ae4 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/opensoldat/default.nix @@ -5,12 +5,12 @@ let base = stdenv.mkDerivation rec { - pname = "soldat-base"; + pname = "opensoldat-base"; version = "unstable-2021-09-05"; src = fetchFromGitHub { name = "base"; - owner = "Soldat"; + owner = "opensoldat"; repo = "base"; rev = "6c74d768d511663e026e015dde788006c74406b5"; sha256 = "175gmkdccy8rnkd95h2zqldqfydyji1hfby8b1qbnl8wz4dh08mz"; @@ -28,7 +28,7 @@ let ''; meta = with lib; { - description = "Soldat's base game content"; + description = "Opensoldat's base game content"; license = licenses.cc-by-40; platforms = platforms.all; inherit (src.meta) homepage; @@ -38,27 +38,22 @@ let in stdenv.mkDerivation rec { - pname = "soldat"; - version = "unstable-2021-11-01"; + pname = "opensoldat"; + version = "unstable-2022-07-02"; src = fetchFromGitHub { - name = "soldat"; - owner = "Soldat"; - repo = "soldat"; - rev = "7780d2948b724970af9f2aaf4fb4e4350d5438d9"; - sha256 = "0r39d1394q7kabsgq6vpdlzwsajxafsg23i0r273nggfvs3m805z"; + name = "opensoldat"; + owner = "opensoldat"; + repo = "opensoldat"; + rev = "9574f5791b7993067f03d2df03d625908bc3762f"; + sha256 = "0kyxzikd4ngx3nshjw0411x61zqq1b7l01lxw41rlcy4nad3r0vi"; }; - patches = [ - # Don't build GameNetworkingSockets as an ExternalProject, - # see https://github.com/Soldat/soldat/issues/73 - ./gamenetworkingsockets-no-external.patch - ]; - nativeBuildInputs = [ fpc makeWrapper autoPatchelfHook cmake ]; cmakeFlags = [ "-DADD_ASSETS=OFF" # We provide base's smods via nix + "-DBUILD_GNS=OFF" # Don't build GameNetworkingSockets as an ExternalProject ]; buildInputs = [ SDL2 freetype physfs openal gamenetworkingsockets ]; @@ -69,6 +64,7 @@ stdenv.mkDerivation rec { # let them write their state and configuration files # to $XDG_CONFIG_HOME/soldat/soldat{,server} unless # the user specifies otherwise. + # TODO(@sternenseemann): rename config dir to opensoldat postInstall = '' for p in $out/bin/soldatserver $out/bin/soldat; do configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$(basename "$p")" @@ -82,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Soldat is a unique 2D (side-view) multiplayer action game"; + description = "Opensoldat is a unique 2D (side-view) multiplayer action game"; license = [ licenses.mit base.meta.license ]; inherit (src.meta) homepage; maintainers = [ maintainers.sternenseemann ]; @@ -90,6 +86,6 @@ stdenv.mkDerivation rec { # portability currently mainly limited by fpc # in nixpkgs which doesn't work on darwin, # aarch64 and arm support should be possible: - # https://github.com/Soldat/soldat/issues/45 + # https://github.com/opensoldat/opensoldat/issues/45 }; } diff --git a/pkgs/games/soldat-unstable/gamenetworkingsockets-no-external.patch b/pkgs/games/soldat-unstable/gamenetworkingsockets-no-external.patch deleted file mode 100644 index 629ca6c67518a..0000000000000 --- a/pkgs/games/soldat-unstable/gamenetworkingsockets-no-external.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1084048..1ea4c84 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,7 +143,8 @@ if(BUILD_CLIENT OR BUILD_SERVER) - file(WRITE ${PROJECT_BINARY_DIR}/bin/steam_appid.txt "638490") - else() - # GameNetworkingSockets -- add_subdirectory(shared/libs/GameNetworkingSockets) -+ # add_subdirectory(shared/libs/GameNetworkingSockets) -+ find_package(GameNetworkingSockets REQUIRED) - endif() - endif() - |