diff --git a/pkgs/development/compilers/rust/1_84.nix b/pkgs/development/compilers/rust/1_84.nix index 149d43e99ef7..d2cc3cfa11da 100644 --- a/pkgs/development/compilers/rust/1_84.nix +++ b/pkgs/development/compilers/rust/1_84.nix @@ -14,9 +14,6 @@ lib, newScope, callPackage, - CoreFoundation, - Security, - SystemConfiguration, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 7000f1daadd4..4461d87f0853 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,7 +1,6 @@ { lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, rustPlatform, rustc -, CoreFoundation, Security , auditable ? !cargo-auditable.meta.broken , cargo-auditable , pkgsBuildBuild @@ -32,8 +31,7 @@ rustPlatform.buildRustPackage.override { (lib.getDev pkgsHostHost.curl) zlib ]; - buildInputs = [ file curl python3 openssl zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; + buildInputs = [ file curl python3 openssl zlib ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 42b285cd72ab..8bb0fec433c1 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -3,7 +3,6 @@ lib, rustPlatform, rustc, - Security, }: rustPlatform.buildRustPackage { @@ -19,7 +18,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ rustc.llvm ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 788f8e67da08..b79b17c6164f 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -13,7 +13,6 @@ }: { stdenv, lib , newScope, callPackage -, CoreFoundation, Security, SystemConfiguration , pkgsBuildBuild , pkgsBuildHost , pkgsBuildTarget @@ -87,13 +86,11 @@ in sysroot = if fastCross then self.rustc-unwrapped else null; }; rustfmt = self.callPackage ./rustfmt.nix { - inherit Security; inherit (self.buildRustPackages) rustc; }; cargo = if (!fastCross) then self.callPackage ./cargo.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; - inherit CoreFoundation Security; } else self.callPackage ./cargo_cross.nix {}; cargo-auditable = self.callPackage ./cargo-auditable.nix { }; cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; @@ -102,7 +99,6 @@ in # buildPackages.clippy uses the cross compiler and supports # linting for the target platform. rustPlatform = makeRustPlatform self; - inherit Security; }; }); }; diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index a0652b127c37..1c18c7afc303 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -5,7 +5,6 @@ makeWrapper, rustPlatform, rustc, - Security, asNightly ? false, }: @@ -26,7 +25,7 @@ rustPlatform.buildRustPackage { buildInputs = [ rustc.llvm - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; # rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have # an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f87b63bd5ff9..48dda355ecfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6539,7 +6539,6 @@ with pkgs; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; rust_1_84 = callPackage ../development/compilers/rust/1_84.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_19 = llvmPackages_19.libllvm; }; rust = rust_1_84;