b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #255609 from marius851000/skytemple155

Browse source 
skytemple: 1.5.4 -> 1.5.5
This commit is contained in:
Weijia Wang 2023-09-17 16:48:41 +02:00 committed by GitHub
parent 6a88110984 df2f096868
commit 2d3be98288
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/skytemple/default.nix
View file

@ -10,13 +10,13 @@
python3Packages.buildPythonApplication rec {
pname = "skytemple";
version = "1.5.4";
version = "1.5.5";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-brt1bNQonAjbqCsMLHgOS8leDb3Y8MWKIxV+BXoJ1lY=";
hash = "sha256-7sv0TzYMQLEaohy45JPPiK2wS3x4sXaevT/BfHaSbWw=";
};
buildInputs = [

8
pkgs/development/python-modules/skytemple-files/default.nix
View file

@ -28,19 +28,19 @@
buildPythonPackage rec {
pname = "skytemple-files";
version = "1.5.4";
version = "1.5.5";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
hash = "sha256-RB+Cp4mL0y59/l7yu0z3jefADHR9/h0rbTZLm7BvJ7k=";
hash = "sha256-PVHI3SuXXH+XpSaBhtSUT5I6wYK3WmwW67nJmPLKdg4=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace skytemple_files/patch/arm_patcher.py \
--replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\""
substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \
--replace "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\""
'';
buildInputs = [ armips ];