Unverified Commit c4592c08 authored by Theodore Ni's avatar Theodore Ni
Browse files

probe-rs-tools: use new Darwin SDK pattern

parent 7d98bd5b

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

+2 −5
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+0 −5
Original line number Diff line number Diff line
@@ -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 {