From 5c2a69848d8463f3b9c715da62a9d8ed7e8030de Mon Sep 17 00:00:00 2001 From: leo60228 Date: Thu, 13 Jun 2024 20:17:51 -0400 Subject: [PATCH] pokefinder: 4.1.2 -> 4.2.0 --- pkgs/tools/games/pokefinder/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index 3ca5520fda15..e4d773684343 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -3,6 +3,7 @@ , copyDesktopItems , makeDesktopItem , fetchFromGitHub +, fetchpatch , cmake , python3 , qtbase @@ -15,17 +16,25 @@ stdenv.mkDerivation rec { pname = "pokefinder"; - version = "4.1.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Admiral-Fish"; repo = "PokeFinder"; rev = "v${version}"; - sha256 = "ps8F6IcbCNybrZ02tbLNyB3YEvKlcYgCpv5Em7Riv+Q="; + sha256 = "R0FrRRQRe0tWrHUoU4PPwOgIsltUEImEMTXL79ISfRE="; fetchSubmodules = true; }; - patches = [ ./set-desktop-file-name.patch ]; + patches = [ + ./set-desktop-file-name.patch + # fix compatibility with our libstdc++ + # https://github.com/Admiral-Fish/PokeFinder/pull/392 + (fetchpatch { + url = "https://github.com/Admiral-Fish/PokeFinder/commit/2cb1b049cabdf0d1b32c8cf29bf6c9d9c5c55cb0.patch"; + hash = "sha256-F/w7ydsZ5tZParMWi33W3Tv8A6LLiJt4dAoCrs40DIo="; + }) + ]; postPatch = '' patchShebangs Source/Core/Resources/