diff options
Diffstat (limited to 'pkgs/tools/games/pokefinder/default.nix')
-rw-r--r-- | pkgs/tools/games/pokefinder/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index de53fb839af9a..e4d773684343e 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -3,7 +3,9 @@ , copyDesktopItems , makeDesktopItem , fetchFromGitHub +, fetchpatch , cmake +, python3 , qtbase , qttools , qtwayland @@ -14,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/ @@ -43,7 +53,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ cmake wrapQtAppsHook ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems imagemagick ]; + nativeBuildInputs = [ cmake wrapQtAppsHook python3 ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems imagemagick ]; desktopItems = [ (makeDesktopItem { |