From c4592c087cd6383653b4c7ed1707ed1cfca29aad Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 10 Nov 2024 08:58:10 -0800 Subject: [PATCH] probe-rs-tools: use new Darwin SDK pattern --- pkgs/by-name/pr/probe-rs-tools/package.nix | 7 ++----- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index b072922e732f..1dc76b3f3237 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa2cd1b06a55..a78857cceadd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {