From 2a230c1b33eb6aab908817d329f94fb136ab921d Mon Sep 17 00:00:00 2001 From: moni-dz Date: Sat, 28 Dec 2024 20:24:39 +0800 Subject: [PATCH] elf2uf2-rs: adapt for new apple-sdk pattern --- pkgs/development/embedded/elf2uf2-rs/default.nix | 13 ++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index 239ffbbeb96b..1191c68c9fd7 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, CoreFoundation, DiskArbitration, Foundation }: +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev }: rustPlatform.buildRustPackage rec { pname = "elf2uf2-rs"; @@ -9,18 +9,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; }; + cargoHash = "sha256-TBH3pLB6vQVGnfShLtFPNKjciuUIuTkvp3Gayzo+X9E="; + nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - DiskArbitration - Foundation - ]; - - cargoHash = "sha256-TBH3pLB6vQVGnfShLtFPNKjciuUIuTkvp3Gayzo+X9E="; + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev; meta = with lib; { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9508dce9689e..c5489cfd03da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8059,9 +8059,7 @@ with pkgs; edb = libsForQt5.callPackage ../development/tools/misc/edb { }; - elf2uf2-rs = darwin.apple_sdk_11_0.callPackage ../development/embedded/elf2uf2-rs { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation DiskArbitration Foundation; - }; + elf2uf2-rs = callPackage ../development/embedded/elf2uf2-rs {}; license_finder = callPackage ../development/tools/license_finder { };