Unverified Commit 788d0cbe authored by Lily Foster's avatar Lily Foster Committed by GitHub
Browse files

Merge pull request #229528 from MaxHearnden/detect_voidp_size 

meson: apply fix for detect_voidp_size
parents fe39eeb2 5d6f0234

pkgs/development/tools/build-managers/meson/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ python3.pkgs.buildPythonApplication rec { 
        "docs/yaml/objects/dep.yaml"

      ];

    })



    # Fix regression in precomputing CMAKE_SIZEOF_VOID_P

    # See https://github.com/mesonbuild/meson/pull/11761

    (fetchpatch {

      url = "https://github.com/mesonbuild/meson/commit/7c78c2b5a0314078bdabb998ead56925dc8b0fc0.patch";

      sha256 = "sha256-vSnHhuOIXf/1X+bUkUmGND5b30ES0O8EDArwb4p2/w4=";

    })

  ];



  setupHook = ./setup-hook.sh;