edgetx: fix build with CMake 4, 2.11.2 -> 2.11.3 (#455664)

This commit is contained in:
dotlambda
2025-10-26 17:52:37 +00:00
committed by GitHub
+11 -3
View File
@@ -15,6 +15,7 @@
miniz,
yaml-cpp,
udevCheckHook,
applyPatches,
# List of targets to build simulators for
targetsToBuild ? import ./targets.nix,
}:
@@ -36,18 +37,24 @@ let
libclang
]
);
# paches are needed to fix build with CMake 4
yaml-cppSrc = applyPatches {
inherit (yaml-cpp) src;
patches = yaml-cpp.patches or [ ];
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "edgetx";
version = "2.11.2";
version = "2.11.3";
src = fetchFromGitHub {
owner = "EdgeTX";
repo = "edgetx";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-F3T1lX0FSSUIQxSlqLQHj7JrfF+20Ndv63zDA0sRzFQ=";
hash = "sha256-vlJsfebTWhdh6HDpUEA1QJJSVGMlcL49XFwIx4A9zHs=";
};
nativeBuildInputs = [
@@ -93,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
# Unvendoring these libraries is infeasible. At least lets reuse the same sources.
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MINIZ" "${miniz.src}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cppSrc}")
# Custom library https://github.com/edgetx/maxLibQt.
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MAXLIBQT" "${maxlibqt}")
(lib.cmakeFeature "DFU_UTIL_ROOT_DIR" "${lib.getBin dfu-util}/bin")
@@ -168,6 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion finalAttrs.version));
homepage = "https://edgetx.org/";
changelog = "https://github.com/EdgeTX/edgetx/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.gpl2Only;
platforms = [
"i686-linux"