diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-08-06 15:06:54 -0700 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-26 06:30:44 +0000 |
| commit | c1df604e9fbae74f7aa7530ec13e14a85758be61 (patch) | |
| tree | cdd153e6887c1ebcc03ea50689ae2e82514ba606 /pkgs/development/compilers/rust | |
| parent | aa53f325374cde77bcad69696616d0e9a7b923e5 (diff) | |
| download | nixlib-c1df604e9fbae74f7aa7530ec13e14a85758be61.tar nixlib-c1df604e9fbae74f7aa7530ec13e14a85758be61.tar.gz nixlib-c1df604e9fbae74f7aa7530ec13e14a85758be61.tar.bz2 nixlib-c1df604e9fbae74f7aa7530ec13e14a85758be61.tar.lz nixlib-c1df604e9fbae74f7aa7530ec13e14a85758be61.tar.xz nixlib-c1df604e9fbae74f7aa7530ec13e14a85758be61.tar.zst nixlib-c1df604e9fbae74f7aa7530ec13e14a85758be61.zip | |
rust: add rust.envVars
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/1_72.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/1_72.nix b/pkgs/development/compilers/rust/1_72.nix index 60eef6d44ec8..f540c229c6ff 100644 --- a/pkgs/development/compilers/rust/1_72.nix +++ b/pkgs/development/compilers/rust/1_72.nix @@ -11,6 +11,7 @@ { stdenv, lib , buildPackages +, targetPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 90e921651f14..0a0af7832366 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -13,6 +13,7 @@ }: { stdenv, lib , buildPackages +, targetPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration , pkgsBuildBuild @@ -21,7 +22,7 @@ let # Use `import` to make sure no packages sneak in here. - lib' = import ../../../build-support/rust/lib { inherit lib; }; + lib' = import ../../../build-support/rust/lib { inherit lib stdenv buildPackages targetPackages; }; # Allow faster cross compiler generation by reusing Build artifacts fastCross = (stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform); in @@ -29,7 +30,7 @@ in lib = lib'; # Backwards compat before `lib` was factored out. - inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget; + inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget toRustTargetForUseInEnvVars envVars; # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions to build |