git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #171617 from tjni/skytemple-rust-darwin
commitce79bdfcf053a772652a61d4b4fb54266518785b authorBen Siraphob <bensiraphob@gmail.com> dateThu 5 May 2022, 00:44 (5 years ago) parent5a51d0457ce8ad
2 files changed+12−3
compare with master
unifiedsplit
pkgs/development/python-modules/skytemple-rust/default.nix+9−2 pkgs/top-level/python-packages.nix+3−1
pkgs/development/python-modules/skytemple-rust/default.nix+9−2
@@ -1,4 +1,11 @@
1−{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }:
1+{ lib
2+, stdenv
3+, buildPythonPackage
4+, fetchFromGitHub
5+, libiconv
6+, Foundation
7+, rustPlatform
8+, setuptools-rust }:
29
310buildPythonPackage rec {
411 pname = "skytemple-rust";
@@ -17,7 +24,7 @@ buildPythonPackage rec {
1724 sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";
1825 };
1926
20− buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
27+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
2128 nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
2229
2330 GETTEXT_SYSTEM = true;
pkgs/top-level/python-packages.nix+3−1
@@ -9484,7 +9484,9 @@ in {
94849484
94859485 skytemple-icons = callPackage ../development/python-modules/skytemple-icons { };
94869486
9487− skytemple-rust = callPackage ../development/python-modules/skytemple-rust { };
9487+ skytemple-rust = callPackage ../development/python-modules/skytemple-rust {
9488+ inherit (pkgs.darwin.apple_sdk.frameworks) Foundation;
9489+ };
94889490
94899491 skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { };
94909492