rust: remove obsolete darwin frameworks

Niklas Korz b885ef3f 0289aa11

Changed files
+3 -15
pkgs
development
top-level
-3
pkgs/development/compilers/rust/1_84.nix
···
lib,
newScope,
callPackage,
-
CoreFoundation,
-
Security,
-
SystemConfiguration,
pkgsBuildTarget,
pkgsBuildBuild,
pkgsBuildHost,
···
lib,
newScope,
callPackage,
pkgsBuildTarget,
pkgsBuildBuild,
pkgsBuildHost,
+1 -3
pkgs/development/compilers/rust/cargo.nix
···
{ 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
···
(lib.getDev pkgsHostHost.curl)
zlib
];
-
buildInputs = [ file curl python3 openssl zlib ]
-
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ];
# 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.
···
{ lib, stdenv, pkgsHostHost
, file, curl, pkg-config, python3, openssl, cmake, zlib
, installShellFiles, makeWrapper, rustPlatform, rustc
, auditable ? !cargo-auditable.meta.broken
, cargo-auditable
, pkgsBuildBuild
···
(lib.getDev pkgsHostHost.curl)
zlib
];
+
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.
+1 -2
pkgs/development/compilers/rust/clippy.nix
···
lib,
rustPlatform,
rustc,
-
Security,
}:
rustPlatform.buildRustPackage {
···
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
-
buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
# fixes: error: the option `Z` is only accepted on the nightly compiler
RUSTC_BOOTSTRAP = 1;
···
lib,
rustPlatform,
rustc,
}:
rustPlatform.buildRustPackage {
···
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
+
buildInputs = [ rustc.llvm ];
# fixes: error: the option `Z` is only accepted on the nightly compiler
RUSTC_BOOTSTRAP = 1;
-4
pkgs/development/compilers/rust/default.nix
···
}:
{ stdenv, lib
, newScope, callPackage
-
, CoreFoundation, Security, SystemConfiguration
, pkgsBuildBuild
, pkgsBuildHost
, pkgsBuildTarget
···
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 { };
···
# buildPackages.clippy uses the cross compiler and supports
# linting for the target platform.
rustPlatform = makeRustPlatform self;
-
inherit Security;
};
});
};
···
}:
{ stdenv, lib
, newScope, callPackage
, pkgsBuildBuild
, pkgsBuildHost
, pkgsBuildTarget
···
sysroot = if fastCross then self.rustc-unwrapped else null;
};
rustfmt = self.callPackage ./rustfmt.nix {
inherit (self.buildRustPackages) rustc;
};
cargo = if (!fastCross) then self.callPackage ./cargo.nix {
# Use boot package set to break cycle
rustPlatform = bootRustPlatform;
} else self.callPackage ./cargo_cross.nix {};
cargo-auditable = self.callPackage ./cargo-auditable.nix { };
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
···
# buildPackages.clippy uses the cross compiler and supports
# linting for the target platform.
rustPlatform = makeRustPlatform self;
};
});
};
+1 -2
pkgs/development/compilers/rust/rustfmt.nix
···
makeWrapper,
rustPlatform,
rustc,
-
Security,
asNightly ? false,
}:
···
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
···
makeWrapper,
rustPlatform,
rustc,
asNightly ? false,
}:
···
buildInputs = [
rustc.llvm
+
];
# 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
-1
pkgs/top-level/all-packages.nix
···
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;
···
wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
rust_1_84 = callPackage ../development/compilers/rust/1_84.nix {
llvm_19 = llvmPackages_19.libllvm;
};
rust = rust_1_84;