diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-06-21 07:48:24 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-06-21 07:48:24 +0200 |
| commit | 879821772ca78519aec914983c3aa2cd77e90c1d (patch) | |
| tree | 5d837f3e0f32541ab0a4919260f5b02f0a8fb919 /pkgs/build-support | |
| parent | 7154858e82d91010bb1289727b606687f32d1b92 (diff) | |
Revert #320852: Clean up cross bootstrapping
It rebuilt stdenv on *-darwin; we can't do that in nixpkgs master. This reverts commit 2f20501c5f188ab0c4c430519ce77bc6b988202b, reversing changes made to fd469c24af2e16aad2c2b4fc90fc8c74af36e773.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 2d75330f1c9ee..2a1fe1344e205 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -10,15 +10,15 @@ , stdenvNoCC , runtimeShell , bintools ? null, libc ? null, coreutils ? null, gnugrep ? null -, netbsd ? null +, netbsd ? null, netbsdCross ? null , sharedLibraryLoader ? if libc == null then null else if stdenvNoCC.targetPlatform.isNetBSD then - if !(targetPackages ? netbsd) then + if !(targetPackages ? netbsdCross) then netbsd.ld_elf_so - else if libc != targetPackages.netbsd.headers then - targetPackages.netbsd.ld_elf_so + else if libc != targetPackages.netbsdCross.headers then + targetPackages.netbsdCross.ld_elf_so else null else |