qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

probe-rs-tools: use new Darwin SDK pattern

Browse Source
This commit is contained in:
Theodore Ni 2024-11-10 08:58:10 -08:00
parent 7d98bd5b52
commit c4592c087c
No known key found for this signature in database
GPG Key ID: 48B67583BDDD4474
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/by-name/pr/probe-rs-tools/package.nix
View File

@ -1,5 +1,4 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, cmake
@ -7,8 +6,6 @@
, pkg-config
, libusb1
, openssl
, DarwinTools
, AppKit
}:
rustPlatform.buildRustPackage rec {
@ -34,9 +31,9 @@ rustPlatform.buildRustPackage rec {
# https://github.com/probe-rs/probe-rs/pull/2492
gitMinimal
pkg-config
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
];
buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
buildInputs = [ libusb1 openssl ];
checkFlags = [
# require a physical probe

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

@ -355,11 +355,6 @@ with pkgs;
buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;
probe-rs-tools = callPackage ../by-name/pr/probe-rs-tools/package.nix {
inherit (darwin.apple_sdk.frameworks) AppKit;
inherit (darwin) DarwinTools;
};
mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; };
prisma-engines = callPackage ../development/tools/database/prisma-engines {