e

leanprover · Sep 10, 2024 · 3533312 · 3533312
1 parent 007fde2
commit 3533312
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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")