faissWithCuda: do not leak the old libstdc++

2023-04-07 00:28:02 +03:00
parent ab9c46d27e
commit 13c47d64aa
1 changed files with 4 additions and 2 deletions
@@ -25,7 +25,7 @@
  builtins.head optLevels
 , faiss # To run demos in the tests
 , runCommand
-}:
+}@inputs:

 assert cudaSupport -> nvidia-thrust.cudaSupport;

@@ -33,9 +33,11 @@ let
  pname = "faiss";
  version = "1.7.2";

-  inherit (cudaPackages) cudaFlags;
+  inherit (cudaPackages) cudaFlags backendStdenv;
  inherit (cudaFlags) cudaCapabilities dropDot;

+  stdenv = if cudaSupport then backendStdenv else inputs.stdenv;
+
  cudaJoined = symlinkJoin {
    name = "cuda-packages-unsplit";
    paths = with cudaPackages; [