Revert "tomlplusplus: apply fix for detect_voidp_size"
This reverts commit 41a5d65780
.
This commit is contained in:
parent
72dd6c7f56
commit
834b6fbf2b
|
@ -1,26 +1,11 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, buildPackages
|
, meson
|
||||||
, 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";
|
||||||
|
@ -32,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||||
hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
|
hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ fixedMeson cmake ninja ];
|
nativeBuildInputs = [ meson cmake ninja ];
|
||||||
|
|
||||||
meta = with lib;{
|
meta = with lib;{
|
||||||
homepage = "https://github.com/marzer/tomlplusplus";
|
homepage = "https://github.com/marzer/tomlplusplus";
|
||||||
|
|
Loading…
Reference in a new issue