diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-06 00:58:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-06 00:58:15 +0200 |
commit | a899d358233d06fa61067015a3dc2dfdf82559dc (patch) | |
tree | 9471e396716bebae8fc4903f82d5d0ed9a59de0a | |
parent | d2da80ca7642a03e8425532378fd4f81fc85d794 (diff) | |
parent | 62b322de1ccc9135aff0c60589b6bc6affce7438 (diff) |
Merge pull request #242570 from fortuneteller2k/elf2uf2-darwin
elf2uf2-rs: support darwin
-rw-r--r-- | pkgs/development/embedded/elf2uf2-rs/default.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index 3b6255683c8cc..d26c0072265c9 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev }: +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev, CoreFoundation, DiskArbitration, Foundation }: rustPlatform.buildRustPackage rec { pname = "elf2uf2-rs"; @@ -13,9 +13,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - udev - ]; + buildInputs = lib.optional stdenv.isLinux udev + ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + DiskArbitration + Foundation + ]; cargoSha256 = "sha256-+3Rqlzkrw9XfM3PelGNbnRGaWQLbzVJ7iJgvGgVt5FE="; @@ -23,7 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; homepage = "https://github.com/JoNil/elf2uf2-rs"; license = with licenses; [ bsd0 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ polygon ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ polygon fortuneteller2k ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1592b3c496c08..a16d298a86158 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18966,7 +18966,9 @@ with pkgs; electron-fiddle = callPackage ../development/tools/electron-fiddle { }; - elf2uf2-rs = callPackage ../development/embedded/elf2uf2-rs { }; + elf2uf2-rs = darwin.apple_sdk_11_0.callPackage ../development/embedded/elf2uf2-rs { + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation DiskArbitration Foundation; + }; elfinfo = callPackage ../development/tools/misc/elfinfo { }; |