diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/aaaaxy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/gogdl/default.nix | 11 | ||||
-rw-r--r-- | pkgs/games/itch/butler.nix | 2 | ||||
-rw-r--r-- | pkgs/games/minesweep-rs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/path-of-building/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/r2modman/default.nix | 5 | ||||
-rw-r--r-- | pkgs/games/r2modman/steam-launch-fix.patch | 21 | ||||
-rw-r--r-- | pkgs/games/uchess/default.nix | 2 |
8 files changed, 38 insertions, 19 deletions
diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index 64f9de8c92b..62ac8ac20c7 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.42"; + version = "1.4.45"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-GD7SgxGZRivVbgrzAe7U0EgkTmrXFvSGzzZUOE7CwbY="; + hash = "sha256-93ffxzYSVumfk7J8K9Ma2WYWaGQLBIxSkds8OKzOCcw="; fetchSubmodules = true; }; - vendorHash = "sha256-1w+/tmF73hN5y5vj++JCX+T5RQ/PF747wmAbN9i7Bgs="; + vendorHash = "sha256-wUH0ohccMjdeGpm9bcw8K7Ss0FZGXaPfxeJCKYkEhJ8="; buildInputs = [ alsa-lib diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix index a6b41e7bd64..d5b3d0a5a54 100644 --- a/pkgs/games/gogdl/default.nix +++ b/pkgs/games/gogdl/default.nix @@ -17,8 +17,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "heroic-gogdl"; - rev = "d2fa34bfba7beb2ecc0e3fc70a657f2c612c8a10"; - hash = "sha256-YCqtfY49lDg6sLrF/INOZVD9cMCwvejhySzUWrxHKAw="; + rev = "89d15f1593cc26f15a5f8f409bb623764c095d37"; + hash = "sha256-EECpXGVhcwihKB8fLObVvYzFD8uh7CxYKtFiGc0Jqbk="; }; disabled = pythonOlder "3.8"; @@ -28,13 +28,6 @@ buildPythonApplication rec { requests ]; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/Heroic-Games-Launcher/heroic-gogdl/pull/37.patch"; - hash = "sha256-oZLetPoWzsEDrL0Bh89HB4hTn70FTh8aXj9mKGr4Dqw="; - }) - ]; - pythonImportsCheck = [ "gogdl" ]; meta = with lib; { diff --git a/pkgs/games/itch/butler.nix b/pkgs/games/itch/butler.nix index d6d9075997a..cbd6b8aef93 100644 --- a/pkgs/games/itch/butler.nix +++ b/pkgs/games/itch/butler.nix @@ -31,7 +31,7 @@ buildGoModule rec { proxyVendor = true; - vendorSha256 = "sha256-CtBwc5mcgLvl2Bvg5gI+ULJMQEEibx1aN3IpmRNUtwE="; + vendorHash = "sha256-CtBwc5mcgLvl2Bvg5gI+ULJMQEEibx1aN3IpmRNUtwE="; doCheck = false; diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index 59f4f057fc0..a448597d9b1 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.29"; + version = "6.0.31"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-PgZ9fL+g2X3CddPVD/JRrIFbw7GS73ELD3EhhR9BAUc="; + hash = "sha256-1jC2tudU5epMOzDR//yjSLNe+5nWzqhWDD2Zxdn5+F4="; }; - cargoHash = "sha256-c06TfslXGAshR1HXz6PCI26DMpFsb6OrzQ38p4RgsAw="; + cargoHash = "sha256-qH464zNpI/Y5SXplTwhPu9TjbqfExQYs/Lh75lPUoh4="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 9b5bcdd1add..e8b9c016dbd 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -2,13 +2,13 @@ let data = stdenv.mkDerivation(finalAttrs: { pname = "path-of-building-data"; - version = "2.33.5"; + version = "2.34.0"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-a7/xuVfsLQaSsmHVFKqDEypCunFQtHvcVISaQD1YCEs="; + hash = "sha256-A672cs930wRV8DwRpah//emtsAidNnOzwtfXiiYxyd4="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index c7c8d6a1076..4e5096eb96f 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { hash = "sha256-CXitb/b2tvTfrkFrFv4KP4WdmMg+1sDtC/s2u5ezDfI="; }; + patches = [ + # Make it possible to launch Steam games from r2modman. + ./steam-launch-fix.patch + ]; + nativeBuildInputs = [ yarn fixup_yarn_lock diff --git a/pkgs/games/r2modman/steam-launch-fix.patch b/pkgs/games/r2modman/steam-launch-fix.patch new file mode 100644 index 00000000000..4a52c8fdb35 --- /dev/null +++ b/pkgs/games/r2modman/steam-launch-fix.patch @@ -0,0 +1,21 @@ +diff --git a/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts b/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts +index ddee0e9..fc9ffca 100644 +--- a/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts ++++ b/src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts +@@ -61,15 +61,9 @@ export default class SteamGameRunner_Linux extends GameRunnerProvider { + async start(game: Game, args: string): Promise<void | R2Error> { + + const settings = await ManagerSettings.getSingleton(game); +- const steamDir = await GameDirectoryResolverProvider.instance.getSteamDirectory(); +- if(steamDir instanceof R2Error) { +- return steamDir; +- } +- +- LoggerProvider.instance.Log(LogSeverity.INFO, `Steam directory is: ${steamDir}`); + + try { +- const cmd = `"${steamDir}/steam.sh" -applaunch ${game.activePlatform.storeIdentifier} ${args} ${settings.getContext().gameSpecific.launchParameters}`; ++ const cmd = `steam -applaunch ${game.activePlatform.storeIdentifier} ${args} ${settings.getContext().gameSpecific.launchParameters}`; + LoggerProvider.instance.Log(LogSeverity.INFO, `Running command: ${cmd}`); + await exec(cmd); + } catch(err) { diff --git a/pkgs/games/uchess/default.nix b/pkgs/games/uchess/default.nix index 58b45609cc4..8cb49bf1e3f 100644 --- a/pkgs/games/uchess/default.nix +++ b/pkgs/games/uchess/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1njl3f41gshdpj431zkvpv2b7zmh4m2m5q6xsijb0c0058dk46mz"; }; - vendorSha256 = "sha256-4yEE1AsSChayCBxaMXPsbls7xGmFeWRhfOMHyAAReDY="; + vendorHash = "sha256-4yEE1AsSChayCBxaMXPsbls7xGmFeWRhfOMHyAAReDY="; # package does not contain any tests as of v0.2.1 doCheck = false; |