@jtojnar it looks like the PR for the patch removed here still hasn't been merged, but now conflicts — would you mind rebasing it?

I think the patch should not be needed any more. IIRC, this was meant to fix build of fwupd, which had been passing multiple variables to define_variable, when Meson suddenly started rejecting that, where it previously silently ignored it. I believe fwupd has since fixed the build script.

Ah cool, okay. Let's try.

@ofborg build fwupd

Built fwupd locally; seems fine!

I need this update to unblock meson-python on Python 3.12 in #271586.

Specifically this patch: mesonbuild/meson@20bcca3

Not sure what we need to try before getting it merged.

I've done a big build with it (all of Spectrum) and everything on the Nixpkgs side seemed fine. I found mesonbuild/meson#12585 but it's pretty niche (affects pkgsStatic + rust — I'm not sure we even have any packages using Meson and Rust that build statically in Nixpkgs).

but it's pretty niche

famous last words Event-Triggering Speech

Nonetheless I believe we can postpone this and merge now.

@alyssais We could also just apply the small patch for now. I think, since the issue you discovered is within the area you care about, you should make the call.

@ofborg build fwupd

We could also just apply the small patch for now.

To which small patch are you referring?

Specifically this patch: mesonbuild/meson@20bcca3

This one

Ah, I see. I misread as there being a patch for the issue I linked. I think it's fine to go ahead with this — I'm very likely the only user of the affected behaviour, and my code that uses it is not in Nixpkgs, so I don't think it's right to block Nixpkgs on it.

Fixes the builds on darwin for me.

But meson apparently got the casing for the framework name wrong, which breaks it on case-sensitive file systems. Discovered by @reckenrode, who'll submit a patch upstream shortly.

diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index e0b251250e87..a4918a293565 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -1,11 +1,11 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , installShellFiles
 , coreutils
 , darwin
 , libxcrypt
+, openldap
 , ninja
 , pkg-config
 , python3
@@ -14,7 +14,7 @@
 }:
 
 let
-  inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation OpenGL;
+  inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation LDAP OpenGL;
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
@@ -85,7 +85,9 @@ python3.pkgs.buildPythonApplication rec {
     AppKit
     Cocoa
     Foundation
+    LDAP
     OpenGL
+    openldap
   ];
 
   checkPhase = lib.concatStringsSep "\n" ([