From b826265c48645e54053baf0060976fe34877e04e Mon Sep 17 00:00:00 2001 From: marius david Date: Sat, 12 Jun 2021 17:10:08 +0200 Subject: [PATCH] python3Packages.skytemple-files: fix non-working patch --- .../skytemple-files/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index cb03d73b4270..0df6419b526a 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant }: +{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips, fetchpatch }: buildPythonPackage rec { pname = "skytemple-files"; @@ -8,9 +8,26 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1vklg4kcj3kb9ryrzrcmywn131b2bp3vy94cd4x4y4s7hkhgwg74"; + sha256 = "sha256-/S0otBujwO/IMiLKgA2o8wlD6xk1/DpwOAfemojV9NU="; + fetchSubmodules = true; }; + patches = [ + # fix patching https://github.com/SkyTemple/skytemple-files/pull/128 + # merged, remove for next update + (fetchpatch { + url = "http://github.com/SkyTemple/skytemple-files/commit/71dd71e6abb7435405e30225e8a37592b990d692.patch"; + sha256 = "sha256-CSBaT+LVP9J0C1FlUCduTJroq9z2EAJG6lruvlHlQLI="; + }) + ]; + + postPatch = '' + substituteInPlace skytemple_files/patch/arm_patcher.py \ + --replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\"" + ''; + + buildInputs = [ armips ]; + propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; doCheck = false; # requires Pokémon Mystery Dungeon ROM @@ -20,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-files"; description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ xfix marius851000 ]; }; }