From 7e5167cbbd315315b88b5343cfb9390251b2d485 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Fri, 1 Dec 2023 08:07:46 +1300 Subject: [PATCH] heroic: 2.10.0 -> 2.11.0 --- pkgs/games/heroic/default.nix | 9 +++------ pkgs/games/heroic/fix-infinite-loop.patch | 23 ----------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 pkgs/games/heroic/fix-infinite-loop.patch diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 9aacc0856c4f..239d78f973c8 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-umPQIxwIahjbO4QbkKEoeSSeYT2UatsTGRPrLgw5KW8="; + hash = "sha256-N+9wNlDARE1zdXW/vka6whFNu5CF240zCJ00EDT1cM0="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-o5ztk4okH21Op1jqHZfranR12M8B1Y/K95aWb10tf5o="; + hash = "sha256-P7Mm9TMNjr2glLQppjJZRMeN9sYKyZWzRaerZIcY3Y8="; }; nativeBuildInputs = [ @@ -45,9 +45,6 @@ in stdenv.mkDerivation rec { ./remove-drm-support.patch # Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic. ./fix-non-steam-shortcuts.patch - # Fix reg add infinite loop - # Submitted upstream: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/3210 - ./fix-infinite-loop.patch ]; postPatch = '' diff --git a/pkgs/games/heroic/fix-infinite-loop.patch b/pkgs/games/heroic/fix-infinite-loop.patch deleted file mode 100644 index 99aae02c3a1a..000000000000 --- a/pkgs/games/heroic/fix-infinite-loop.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b698779053b7ba31bd8e69b230e86515e3019bf6 Mon Sep 17 00:00:00 2001 -From: K900 -Date: Sun, 5 Nov 2023 22:04:32 +0300 -Subject: [PATCH] Force add the registry entry - -Otherwise, newer Wine versions will prompt to overwrite it and loop there forever. ---- - src/backend/storeManagers/legendary/setup.ts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/backend/storeManagers/legendary/setup.ts b/src/backend/storeManagers/legendary/setup.ts -index 1837106621..b5c2432435 100644 ---- a/src/backend/storeManagers/legendary/setup.ts -+++ b/src/backend/storeManagers/legendary/setup.ts -@@ -20,7 +20,7 @@ export const legendarySetup = async (appName: string) => { - - // Fixes games like Fallout New Vegas and Dishonored: Death of the Outsider - await runWineCommandOnGame(appName, { -- commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher'], -+ commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher', '/f'], - wait: true, - protonVerb: 'waitforexitandrun' - })