From 41a5d6578054e3244de88080f09869791edd0f92 Mon Sep 17 00:00:00 2001
From: MaxHearnden <maxoscarhearnden@gmail.com>
Date: Wed, 3 May 2023 13:34:04 +0100
Subject: [PATCH] tomlplusplus: apply fix for detect_voidp_size when

building tomlplusplus
---
 .../libraries/tomlplusplus/default.nix        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix
index a865f88f707d..b86da24d43ab 100644
--- a/pkgs/development/libraries/tomlplusplus/default.nix
+++ b/pkgs/development/libraries/tomlplusplus/default.nix
@@ -1,11 +1,26 @@
 { lib
 , stdenv
-, meson
+, buildPackages
 , cmake
 , ninja
 , fetchFromGitHub
+, fetchpatch
 }:
 
+# Fix regression in precomputing CMAKE_SIZEOF_VOID_P
+# See https://github.com/mesonbuild/meson/pull/11761
+let fixedMeson =
+      buildPackages.meson.overrideAttrs (
+        {patches ? [], ...}: {
+          patches = patches ++ [
+            (fetchpatch {
+              url = "https://github.com/mesonbuild/meson/commit/7c78c2b5a0314078bdabb998ead56925dc8b0fc0.patch";
+              sha256 = "sha256-vSnHhuOIXf/1X+bUkUmGND5b30ES0O8EDArwb4p2/w4=";
+            })
+          ];
+        }
+      ); in
+
 stdenv.mkDerivation rec {
   pname = "tomlplusplus";
   version = "3.3.0";
@@ -17,7 +32,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
   };
 
-  nativeBuildInputs = [ meson cmake ninja ];
+  nativeBuildInputs = [ fixedMeson cmake ninja ];
 
   meta = with lib;{
     homepage = "https://github.com/marzer/tomlplusplus";