Unverified Commit cc95744c authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #229669 from MaxHearnden/tomlplusplus

tomlplusplus: apply fix for detect_voidp_size when building tomlplusplus
parents d6b6b5f9 41a5d657
Loading
Loading
Loading
Loading
+17 −2
Original line number Diff line number Diff line
{ 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";