pokefinder: 4.2.1 -> 4.3.1 (#481448)
This commit is contained in:
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pokefinder";
|
||||
version = "4.2.1";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Admiral-Fish";
|
||||
repo = "PokeFinder";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "wjHqox0Vxc73/UTcE7LSo/cG9o4eOqkcjTIW99BxsAc=";
|
||||
hash = "sha256-tItPvA0f2HnY7SUSnb7A5jGwbRs7eQoS4vibBomZ9pw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -27,20 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./set-desktop-file-name.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs Source/Core/Resources/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isDarwin) ''
|
||||
mkdir -p $out/Applications
|
||||
cp -R Source/PokeFinder.app $out/Applications
|
||||
cp -R PokeFinder.app $out/Applications
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
install -D Source/PokeFinder $out/bin/PokeFinder
|
||||
icoFileToHiColorTheme $src/Source/Form/Images/pokefinder.ico pokefinder $out
|
||||
install -D PokeFinder $out/bin/PokeFinder
|
||||
icoFileToHiColorTheme $src/Form/Images/pokefinder.ico pokefinder $out
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
@@ -49,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
python3
|
||||
(python3.withPackages (ps: [ ps.zstandard ]))
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff --git a/Source/main.cpp b/Source/main.cpp
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 3e58a381..2e7e4a86 100644
|
||||
--- a/Source/main.cpp
|
||||
+++ b/Source/main.cpp
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication a(argc, argv);
|
||||
|
||||
Reference in New Issue
Block a user