diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-07 11:25:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-07 11:49:31 +0000 |
| commit | 1dcba1771488099ae4a03cb56fcf7f480e9a49d1 (patch) | |
| tree | 6492eddce9087c7459759fc3ec8e5c7b8440fe74 /pkgs/build-support/bintools-wrapper | |
| parent | 41387135ddb01d84049d1931292cacabbde54a34 (diff) | |
wrapBintoolsWith: fix final stage NetBSD
Fixes "bintools" on NetBSD -- without this only the version in stdenv would work, not the one from the final stage. Andi tried to warn me about this[1]. Andi, I'm sorry for doubting you. [1]: https://github.com/NixOS/nixpkgs/pull/124499#discussion_r641949801
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index bf81d00e5ea71..5d2f2f977a709 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -14,7 +14,9 @@ if libc == null then null else if stdenvNoCC.targetPlatform.isNetBSD then - if libc != targetPackages.netbsdCross.headers then + if !(targetPackages ? netbsdCross) then + netbsd.ld_elf_so + else if libc != targetPackages.netbsdCross.headers then targetPackages.netbsdCross.ld_elf_so else null |