From 3533312e8f4ef350f057d9da8a5a785965c9f538 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Tue, 10 Sep 2024 15:20:46 +0200 Subject: [PATCH] e --- flake.nix | 1 + src/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 72f5d6d88f78..abe17a33b856 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,7 @@ LIBUV = pkgsDist.libuv.overrideAttrs (attrs: { configureFlags = ["--enable-static"]; hardeningDisable = [ "stackprotector" ]; + # Sync version with CMakeLists.txt version = "1.48.0"; src = pkgs.fetchFromGitHub { owner = "libuv"; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc7569358694..7da72015664d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -250,8 +250,9 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "Emscripten") ExternalProject_add(libuv PREFIX libuv GIT_REPOSITORY https://github.com/libuv/libuv + # Sync version with flake.nix GIT_TAG v1.48.0 - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DLIBUV_BUILD_TESTS=OFF -DLIBUV_BUILD_SHARED=OFF -DCMAKE_AR=${CMAKE_SOURCE_DIR}/../emsdk/emsdk-main/upstream/emscripten/emar -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/../emsdk/emsdk-main/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=${LIBUV_EMSCRIPTEN_FLAGS} + CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DLIBUV_BUILD_TESTS=OFF -DLIBUV_BUILD_SHARED=OFF -DCMAKE_AR=${CMAKE_AR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=${LIBUV_EMSCRIPTEN_FLAGS} BUILD_IN_SOURCE ON INSTALL_COMMAND "") set(LIBUV_INCLUDE_DIR "${CMAKE_BINARY_DIR}/libuv/src/libuv/include")