mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity

luaPackages.toml: fix build

Browse source
This commit is contained in:
Gaetan Lepage 2024-03-09 19:59:15 +01:00
parent cad647ca6f
commit 1c8e4a0700
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/lua-modules/overrides.nix
View file

@ -677,12 +677,13 @@ in
toml = prev.toml.overrideAttrs (oa: {
patches = [ ./toml.patch ];
propagatedBuildInputs = oa.propagatedBuildInputs ++ [ magic-enum sol2 ];
nativeBuildInputs = oa.nativeBuildInputs ++ [ tomlplusplus ];
propagatedBuildInputs = oa.propagatedBuildInputs ++ [ sol2 ];
postPatch = ''
substituteInPlace CMakeLists.txt --replace \
"TOML_PLUS_PLUS_SRC" \
"${tomlplusplus.src}"
substituteInPlace CMakeLists.txt \
--replace "TOML_PLUS_PLUS_SRC" "${tomlplusplus.src}" \
--replace "MAGIC_ENUM_SRC" "${magic-enum.src}"
'';
});

25
pkgs/development/lua-modules/toml.patch
View file

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab3884c..9432df7 100644
index faae37a..6990d4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,26 +38,17 @@ include(FetchContent)
@ -9,8 +9,8 @@ index ab3884c..9432df7 100644
- GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git"
- GIT_SHALLOW ON
- GIT_SUBMODULES ""
- GIT_TAG "v3.3.0"
+ DOWNLOAD_COMMAND true
- GIT_TAG "v3.4.0"
+ DOWNLOAD_COMMAND true
)
FetchContent_Declare(
@ -19,7 +19,7 @@ index ab3884c..9432df7 100644
- GIT_SHALLOW ON
- GIT_SUBMODULES ""
- GIT_TAG "v3.3.0"
+ DOWNLOAD_COMMAND true
+ DOWNLOAD_COMMAND true
)
FetchContent_Declare(
@ -27,17 +27,26 @@ index ab3884c..9432df7 100644
- GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
- GIT_SHALLOW ON
- GIT_SUBMODULES ""
- GIT_TAG "v0.8.2"
+ DOWNLOAD_COMMAND true
- GIT_TAG "v0.9.5"
+ DOWNLOAD_COMMAND true
)
FetchContent_GetProperties(${TOML++})
@@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES))
@@ -112,7 +103,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES))
find_package(Lua)
endif()
-include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include)
+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include)
+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC/include)
set(SOURCES
src/toml.cpp
@@ -129,7 +120,7 @@ source_group(src FILES ${SOURCES})
if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR MSVC)
target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib)
else()
- target_link_libraries(toml.lua ${LUA_LIBRARIES} tomlplusplus::tomlplusplus)
+ target_link_libraries(toml.lua ${LUA_LIBRARIES} tomlplusplus)
endif()
if (LINK_FLAGS)