Unverified Commit 2d3be982 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #255609 from marius851000/skytemple155 

skytemple: 1.5.4 -> 1.5.5
parents 6a881109 df2f0968

pkgs/applications/misc/skytemple/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/python-modules/skytemple-files/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 ];