From 13c47d64aa7b3374cf414ae7d362d0d003cacb4b Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 5 Apr 2023 19:04:42 +0300 Subject: [PATCH] faissWithCuda: do not leak the old libstdc++ --- pkgs/development/libraries/science/math/faiss/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 2a6f144d862..9d0265a9ce8 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -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; [