From bd121768887ec4d97a0245faaa0bf6eaba96e2b8 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 1 Nov 2024 18:20:32 +0100 Subject: [PATCH] stdenvAdapters: set default_both_libraries for meson in makeStaticLibrary The default value of `default_both_libraries` is 'shared'. This change supplements the existing `default_library` flag for static builds. --- pkgs/stdenv/adapters.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index c5815d483bde..46bb76fc9d6e 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -130,7 +130,10 @@ rec { "--disable-shared" ]; cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_SHARED_LIBS:BOOL=OFF" ]; - mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; + mesonFlags = (args.mesonFlags or []) ++ [ + "-Ddefault_library=static" + "-Ddefault_both_libraries=static" + ]; }); });