From 665daed22baa568de3985e294b5f0515565a496f Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 14 Feb 2024 20:06:30 +0000 Subject: [PATCH] meson: fix build on FreeBSD (and possibly other non-darwin clang) --- pkgs/by-name/me/meson/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index b2c85c431e01..cd56025a8765 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -4,6 +4,8 @@ , installShellFiles , coreutils , darwin +, libblocksruntime +, llvmPackages , libxcrypt , openldap , ninja @@ -93,6 +95,11 @@ python3.pkgs.buildPythonApplication rec { OpenAL OpenGL openldap + ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.isDarwin) [ + # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build + llvmPackages.openmp + # https://github.com/mesonbuild/meson/blob/1670fca36fcb1a4fe4780e96731e954515501a35/test%20cases/frameworks/29%20blocks/meson.build + libblocksruntime ]; checkPhase = lib.concatStringsSep "\n" ([