diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-06-15 12:15:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-15 12:15:32 +0200 |
| commit | c339c066b893e5683830ba870b1ccd3bbea88ece (patch) | |
| tree | 6a1334c48b4f5569165a9cb1f2532e54cfade995 /pkgs/tools | |
| parent | 007179238755938dcb56bd05a1972bb5a44e946a (diff) | |
| parent | 5c2a69848d8463f3b9c715da62a9d8ed7e8030de (diff) | |
Merge pull request #317634 from leo60228/pokefinder-4.2.0
pokefinder: 4.1.2 -> 4.2.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/games/pokefinder/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index 3ca5520fda15a..e4d773684343e 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/ |