From 2f9cef5a5ed0cc2128e32c057fb087cca344ca73 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 16 Nov 2024 16:37:19 -0600 Subject: [PATCH] rust-analyzer-unwrapped: apple-sdk refactor We don't need to define frameworks manually. --- pkgs/development/tools/rust/rust-analyzer/default.nix | 3 --- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 89fd2b7b6f04..7c1c1484edd8 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, - callPackage, fetchFromGitHub, rustPlatform, - CoreServices, cmake, libiconv, useMimalloc ? false, @@ -44,7 +42,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optional useMimalloc cmake; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices libiconv ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efa448c47cd0..bc48643c5fa2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7081,9 +7081,7 @@ with pkgs; opensyclWithRocm = opensycl.override { rocmSupport = true; }; rustfmt = rustPackages.rustfmt; - rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer { }; rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { }; rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { };