diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-06-23 00:32:22 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-06-23 00:32:22 +0200 |
| commit | 6402b188ddd100b3cd6afe7b8a3e553365203f43 (patch) | |
| tree | 676b85e4a6ffee092e413e723f7dce8ba01bb48f /nixpkgs/pkgs/build-support/bintools-wrapper/default.nix | |
| parent | 5a1826585861b32ce2509c0643e793196d81893e (diff) | |
| parent | d603719ec6e294f034936c0d0dc06f689d91b6c3 (diff) | |
| download | nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.gz nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.bz2 nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.lz nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.xz nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.tar.zst nixlib-6402b188ddd100b3cd6afe7b8a3e553365203f43.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/build-support/bintools-wrapper/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/build-support/bintools-wrapper/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 5ca5bc3f5eb3..2d75330f1c9e 100644 --- a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -10,15 +10,15 @@ , stdenvNoCC , runtimeShell , bintools ? null, libc ? null, coreutils ? null, gnugrep ? null -, netbsd ? null, netbsdCross ? null +, netbsd ? null , sharedLibraryLoader ? if libc == null then null else if stdenvNoCC.targetPlatform.isNetBSD then - if !(targetPackages ? netbsdCross) then + if !(targetPackages ? netbsd) then netbsd.ld_elf_so - else if libc != targetPackages.netbsdCross.headers then - targetPackages.netbsdCross.ld_elf_so + else if libc != targetPackages.netbsd.headers then + targetPackages.netbsd.ld_elf_so else null else @@ -60,6 +60,7 @@ , postLinkSignHook ? null, signingUtils ? null }: +assert propagateDoc -> bintools ? man; assert nativeTools -> !propagateDoc && nativePrefix != ""; assert !nativeTools -> bintools != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); @@ -128,7 +129,7 @@ let else if targetPlatform.isRiscV then "${sharedLibraryLoader}/lib/ld-linux-riscv*.so.1" else if targetPlatform.isLoongArch64 then "${sharedLibraryLoader}/lib/ld-linux-loongarch*.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" - else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" + else if targetPlatform.isFreeBSD then "${sharedLibraryLoader}/libexec/ld-elf.so.1" else if hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else ""; |