diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-21 12:01:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-21 12:01:47 +0000 |
| commit | a3599a93ae4cea3bcfc3accf138e78370fd4979f (patch) | |
| tree | b9feadc46ab0db4d9845f45f5a005be6c25a02e5 /pkgs/build-support | |
| parent | f7a3dcb82b3c6fb86aefa13ff2e4eaafe52dd27b (diff) | |
| parent | 262ee2400ecb4710ac9eaf9d683d202c44bc24e0 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5ca5bc3f5eb3b..2a1fe1344e205 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -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 ""; |