Merge pull request #171617 from tjni/skytemple-rust-darwin

main
Ben Siraphob 2 years ago committed by GitHub
commit ce79bdfcf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      pkgs/development/python-modules/skytemple-rust/default.nix
  2. 4
      pkgs/top-level/python-packages.nix

@ -1,4 +1,11 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }:
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, libiconv
, Foundation
, rustPlatform
, setuptools-rust }:
buildPythonPackage rec {
pname = "skytemple-rust";
@ -17,7 +24,7 @@ buildPythonPackage rec {
sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";
};
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
GETTEXT_SYSTEM = true;

@ -9484,7 +9484,9 @@ in {
skytemple-icons = callPackage ../development/python-modules/skytemple-icons { };
skytemple-rust = callPackage ../development/python-modules/skytemple-rust { };
skytemple-rust = callPackage ../development/python-modules/skytemple-rust {
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation;
};
skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { };

Loading…
Cancel
Save