haskellPackages.libtorch-ffi: Fix the link to libtorch (#367998)

NixOS · Jan 3, 2025 · d3780c9 · d3780c9
2 parents f371cde + 0145fac
commit d3780c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -388,6 +388,8 @@ self: super: ({
   http-reverse-proxy = dontCheck super.http-reverse-proxy;
   servant-auth-server = dontCheck super.servant-auth-server;
 
+  sysinfo = dontCheck super.sysinfo;
+
 } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {  # aarch64-darwin
 
   # Workarounds for justStaticExecutables on aarch64-darwin. Since dead code

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1536,4 +1536,13 @@ self: super: builtins.intersectAttrs super {
   # certificate used only 1024 Bit RSA key and SHA-1, which is not allowed in OpenSSL 3.1+
   # security level 2
   openssl-streams = appendPatch ./patches/openssl-streams-cert.patch super.openssl-streams;
+
+  libtorch-ffi = appendConfigureFlags ([
+    "--extra-include-dirs=${lib.getDev pkgs.libtorch-bin}/include/torch/csrc/api/include"
+  ] ++ (lib.optionals pkgs.config.cudaSupport [ "-f" "cuda" ])
+  ) (super.libtorch-ffi.override ({
+    c10 = pkgs.libtorch-bin;
+    torch = pkgs.libtorch-bin;
+    torch_cpu = pkgs.libtorch-bin;
+  }));
 }