dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #196221 from jmesmon/cargo-espflash-udev-linux

Browse Source 
cargo-espflash: fix build on darwin
This commit is contained in:
figsoda 2022-10-16 16:23:38 -04:00 committed by GitHub
commit d596207377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/rust/cargo-espflash/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }:
{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev, stdenv, Security }:
rustPlatform.buildRustPackage rec {
pname = "cargo-espflash";
@ -15,8 +15,10 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs = [
buildInputs = lib.optionals stdenv.isLinux [
udev
] ++ lib.optionals stdenv.isDarwin [
Security
];
cargoSha256 = "sha256-82o3B6qmBVPpBVAogClmTbxrBRXY8Lmd2sHmonP5/s8=";

4
pkgs/top-level/all-packages.nix
View File

@ -14745,7 +14745,9 @@ with pkgs;
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
cratesIO = callPackage ../build-support/rust/crates-io.nix { };
cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { };
cargo-espflash = callPackage ../development/tools/rust/cargo-espflash {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-web = callPackage ../development/tools/rust/cargo-web {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;