b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #135441 from happysalada/cargo_flash_darwin

Browse source 
cargo-flash: fix darwin build
This commit is contained in:
Sandro 2021-08-23 16:00:57 +02:00 committed by GitHub
parent 031fb43cfb 00ace5a483
commit e68ca27003
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/tools/rust/cargo-flash/default.nix
View file

@ -7,6 +7,7 @@
, pkg-config
, rustfmt
, Security
, AppKit
}:
rustPlatform.buildRustPackage rec {
@ -23,7 +24,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-f5vUMdyz3vDh2yE0pMKZiknsqTAKkuvTCtlgb6/gaLc=";
nativeBuildInputs = [ pkg-config rustfmt ];
buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ];
meta = with lib; {
description = "A cargo extension for working with microcontrollers";

2
pkgs/top-level/all-packages.nix
View file

@ -12240,7 +12240,7 @@ with pkgs;
cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
cargo-flash = callPackage ../development/tools/rust/cargo-flash {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security AppKit;
};
cargo-fund = callPackage ../development/tools/rust/cargo-fund {
inherit (darwin.apple_sdk.frameworks) Security;