alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

tomlplusplus: apply fix for detect_voidp_size when

Browse source 
building tomlplusplus
This commit is contained in:
MaxHearnden 2023-05-03 13:34:04 +01:00
parent e594440755
commit 41a5d65780
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/libraries/tomlplusplus/default.nix
View file

@ -1,11 +1,26 @@
{ lib { lib
, stdenv , stdenv
, meson , buildPackages
, cmake , cmake
, ninja , ninja
, fetchFromGitHub , 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 { stdenv.mkDerivation rec {
pname = "tomlplusplus"; pname = "tomlplusplus";
version = "3.3.0"; version = "3.3.0";
@ -17,7 +32,7 @@ stdenv.mkDerivation rec {
hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
}; };
nativeBuildInputs = [ meson cmake ninja ]; nativeBuildInputs = [ fixedMeson cmake ninja ];
meta = with lib;{ meta = with lib;{
homepage = "https://github.com/marzer/tomlplusplus"; homepage = "https://github.com/marzer/tomlplusplus";