diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-23 15:51:03 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-23 17:25:50 +0100 |
| commit | 3bf20e5bf80ebf221cf500412e6df2cb0601aaee (patch) | |
| tree | b97541f5246a9c04b80faeec93fdf7f9fea28749 /pkgs/development/compilers/rust | |
| parent | f3a07da669be5ae45211fb08fdf0680909545709 (diff) | |
| download | nixlib-3bf20e5bf80ebf221cf500412e6df2cb0601aaee.tar nixlib-3bf20e5bf80ebf221cf500412e6df2cb0601aaee.tar.gz nixlib-3bf20e5bf80ebf221cf500412e6df2cb0601aaee.tar.bz2 nixlib-3bf20e5bf80ebf221cf500412e6df2cb0601aaee.tar.lz nixlib-3bf20e5bf80ebf221cf500412e6df2cb0601aaee.tar.xz nixlib-3bf20e5bf80ebf221cf500412e6df2cb0601aaee.tar.zst nixlib-3bf20e5bf80ebf221cf500412e6df2cb0601aaee.zip | |
rust.envVars: use wrapped LLD for aarch64 musl
The unwrapped version doesn't know where to look for libraries, so this is required to e.g. build anything that uses openssl-sys with OPENSSL_NO_VENDOR. A randomly chosen example package that's fixed by this change is pkgsStatic.gitoxide.
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/1_75.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/1_75.nix b/pkgs/development/compilers/rust/1_75.nix index d41a263c8a29..2ca1e2d294bc 100644 --- a/pkgs/development/compilers/rust/1_75.nix +++ b/pkgs/development/compilers/rust/1_75.nix @@ -56,4 +56,4 @@ import ./default.nix { rustcPatches = [ ]; } -(builtins.removeAttrs args [ "pkgsBuildTarget" "llvmPackages_17" "llvm_17"]) +(builtins.removeAttrs args [ "llvmPackages_17" "llvm_17"]) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index f00c469cd19c..31501e668c89 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -16,6 +16,7 @@ , CoreFoundation, Security, SystemConfiguration , pkgsBuildBuild , pkgsBuildHost +, pkgsBuildTarget , pkgsTargetTarget , makeRustPlatform , wrapRustcWith @@ -23,7 +24,9 @@ let # Use `import` to make sure no packages sneak in here. - lib' = import ../../../build-support/rust/lib { inherit lib stdenv pkgsBuildHost pkgsTargetTarget; }; + lib' = import ../../../build-support/rust/lib { + inherit lib stdenv pkgsBuildHost pkgsBuildTarget pkgsTargetTarget; + }; # Allow faster cross compiler generation by reusing Build artifacts fastCross = (stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform); in |