diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/rust')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/1_72.nix | 1 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/default.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/rustc.nix | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/rust/1_72.nix b/nixpkgs/pkgs/development/compilers/rust/1_72.nix index 60eef6d44ec8..f540c229c6ff 100644 --- a/nixpkgs/pkgs/development/compilers/rust/1_72.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/compilers/rust/default.nix b/nixpkgs/pkgs/development/compilers/rust/default.nix index 90e921651f14..0a0af7832366 100644 --- a/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 869dd15df0be..0cf5020962cf 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -263,7 +263,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members; + maintainers = with maintainers; [ globin havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = [ # Platforms with host tools from |