From 9f76d1347c783d30af472d1950643403c4c9404f Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 14 May 2024 13:36:32 -0700 Subject: [PATCH] bintools: Fix dynamic loader path for FreeBSD --- pkgs/build-support/bintools-wrapper/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 "";