summary refs log tree commit diff
diff options
context:
space:
mode:
authoremilylange <git@emilylange.de>2023-08-25 14:04:23 +0200
committeremilylange <git@emilylange.de>2023-08-25 14:04:23 +0200
commita0fbc9fc328d0208d7af3d75988177e50b334493 (patch)
treeea9f761a7be064e435c0b6836d44fcf48eae1724
parenta11e7e3428ef41e481b5627dfa80e8c8a6b3778d (diff)
downloadnixpkgs-a0fbc9fc328d0208d7af3d75988177e50b334493.tar
nixpkgs-a0fbc9fc328d0208d7af3d75988177e50b334493.tar.gz
nixpkgs-a0fbc9fc328d0208d7af3d75988177e50b334493.tar.bz2
nixpkgs-a0fbc9fc328d0208d7af3d75988177e50b334493.tar.lz
nixpkgs-a0fbc9fc328d0208d7af3d75988177e50b334493.tar.xz
nixpkgs-a0fbc9fc328d0208d7af3d75988177e50b334493.tar.zst
nixpkgs-a0fbc9fc328d0208d7af3d75988177e50b334493.zip
onnxruntime: fix building with new re2 version
error log:
```
Call Stack (most recent call first):
  /nix/store/mn0hmdazgdpwlzqbh6x039cg94dg0sz8-abseil-cpp-20210324.2/lib/cmake/absl/abslConfig.cmake:32 (include)
  /nix/store/201j99lxv8i53s946rdgjir9m8npqp44-cmake-3.26.4/share/cmake-3.26/Modules/CMakeFindDependencyMacro.cmake:76 (find_package)
  /nix/store/0vacg8f7n1jz9y03bphp991lvljw24jn-re2-2023-08-01-dev/lib/cmake/re2/re2Config.cmake:40 (find_dependency)
  external/helper_functions.cmake:120 (find_package)
  external/onnxruntime_external_deps.cmake:306 (onnxruntime_fetchcontent_makeavailable)
  CMakeLists.txt:510 (include)
```
-rw-r--r--pkgs/development/libraries/onnxruntime/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
index 99e45c1013d..1b955b57de4 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -132,6 +132,7 @@ stdenv.mkDerivation rec {
   cmakeDir = "../cmake";
 
   cmakeFlags = [
+    "-DABSL_ENABLE_INSTALL=ON"
     "-DCMAKE_BUILD_TYPE=RELEASE"
     "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
     "-DFETCHCONTENT_QUIET=OFF"
@@ -143,6 +144,7 @@ stdenv.mkDerivation rec {
     "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}"
     "-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}"
     "-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}"
+    "-DFETCHCONTENT_SOURCE_DIR_RE2=${re2.src}"
     "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}"
     "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
     "-Donnxruntime_BUILD_SHARED_LIB=ON"