git.iko.soy/typeable/nixpkgs
on master help sign in
probe-run: fix darwin build (#123494)
commitfbf1525f0186aaaf7f7c84eee3ec35b9573e80f1 authorStéphan Kochen <git@stephank.nl> dateTue 18 May 2021, 16:35 (6 years ago) parent7e9451f
2 files changed+7−3
pkgs/development/tools/rust/probe-run/default.nix+4−2 pkgs/top-level/all-packages.nix+3−1
pkgs/development/tools/rust/probe-run/default.nix+4−2
@@ -1,4 +1,5 @@
1−{ lib, rustPlatform, fetchFromGitHub, pkg-config, libusb1 }:
1+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, libusb1
2+, libiconv, AppKit, IOKit }:
23
34rustPlatform.buildRustPackage rec {
45 pname = "probe-run";
@@ -14,7 +15,8 @@ rustPlatform.buildRustPackage rec {
1415 cargoSha256 = "HmDKfb8F6sGnaX64FR3No2GbBYm4bVopbjs8d35WiZQ=";
1516
1617 nativeBuildInputs = [ pkg-config ];
17− buildInputs = [ libusb1 ];
18+ buildInputs = [ libusb1 ]
19+ ++ lib.optionals stdenv.isDarwin [ libiconv AppKit IOKit ];
1820
1921 meta = with lib; {
2022 description = "Run embedded programs just like native ones.";
pkgs/top-level/all-packages.nix+3−1
@@ -265,7 +265,9 @@ in
265265
266266 html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
267267
268− probe-run = callPackage ../development/tools/rust/probe-run {};
268+ probe-run = callPackage ../development/tools/rust/probe-run {
269+ inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
270+ };
269271
270272 proto-contrib = callPackage ../development/tools/proto-contrib {};
271273