diff options
-rw-r--r-- | pkgs/os-specific/linux/libselinux/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/compression/xar/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 695012effc5c9..62db42e13aa0b 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -61,6 +61,8 @@ stdenv.mkDerivation rec { "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" "ARCH=${stdenv.hostPlatform.linuxArch}" + ] ++ optionals (fts != null) [ + "FTS_LDLIBS=-lfts" ] ++ optionals stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=y" ] ++ optionals enablePython [ diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index fa680ebcf51c5..9c03c41054be9 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { --replace 'openssl/evp.h' 'openssl/crypto.h' ''; + configureFlags = lib.optional (fts != null) "LDFLAGS=-lfts"; + meta = { homepage = "https://mackyle.github.io/xar/"; description = "Extensible Archiver"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c207c5c11d8bc..aaaa3fa903153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41815,7 +41815,7 @@ with pkgs; mount wall hostname more sysctl getconf getent locale killall xxd watch; - fts = if stdenv.hostPlatform.isMusl then netbsd.fts else null; + fts = if stdenv.hostPlatform.isMusl then musl-fts else null; bsdSetupHook = makeSetupHook { name = "bsd-setup-hook"; |