diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 5556e85f8566..29a15ad00397 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -249,7 +249,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dlibelf=disabled" ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ - "-Db_lundef=false" "-Dxattr=false" "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD ]; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index b8acdb939ab7..bdefa68e0390 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -144,6 +144,7 @@ python3.pkgs.buildPythonApplication rec { ''; setupHook = ./setup-hook.sh; + env.hostPlatform = stdenv.targetPlatform.system; meta = { homepage = "https://mesonbuild.com"; diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 1885265eabbf..5aa5b7ed3c02 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -26,6 +26,11 @@ mesonConfigurePhase() { "--buildtype=${mesonBuildType:-plain}" ) + # --no-undefined is universally a bad idea on freebsd because environ is in the csu + if [[ "@hostPlatform@" == *-freebsd ]]; then + flagsArray+=("-Db_lundef=false") + fi + concatTo flagsArray mesonFlags mesonFlagsArray echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}"