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

cargo-espflash: fix build on darwin

Browse Source 
- udev is only needed on linux (and is blocked from building on darwin
   via systemd being marked as broken)
 - Security is required (otherwise a link error occurs)
This commit is contained in:
Cody P Schafer 2022-10-15 20:28:50 -04:00
parent d92b297a77
commit 7345d52e87
No known key found for this signature in database
GPG Key ID: 794D748B8B8BF912
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 { rustPlatform.buildRustPackage rec {
pname = "cargo-espflash"; pname = "cargo-espflash";
@ -15,8 +15,10 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
]; ];
buildInputs = [ buildInputs = lib.optionals stdenv.isLinux [
udev udev
] ++ lib.optionals stdenv.isDarwin [
Security
]; ];
cargoSha256 = "sha256-82o3B6qmBVPpBVAogClmTbxrBRXY8Lmd2sHmonP5/s8="; cargoSha256 = "sha256-82o3B6qmBVPpBVAogClmTbxrBRXY8Lmd2sHmonP5/s8=";

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

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