mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
probe-rs-tools: use new Darwin SDK pattern
This commit is contained in:
parent
7d98bd5b52
commit
c4592c087c
@ -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
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user