diff options
Diffstat (limited to 'pkgs/development/cuda-modules/backend-stdenv.nix')
| -rw-r--r-- | pkgs/development/cuda-modules/backend-stdenv.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/cuda-modules/backend-stdenv.nix b/pkgs/development/cuda-modules/backend-stdenv.nix index 3b4c8d47c5e8b..bcca7118b163b 100644 --- a/pkgs/development/cuda-modules/backend-stdenv.nix +++ b/pkgs/development/cuda-modules/backend-stdenv.nix @@ -13,18 +13,14 @@ let gccMajorVersion = nvccCompatibilities.${cudaVersion}.gccMaxMajorVersion; cudaStdenv = stdenvAdapters.useLibsFrom stdenv pkgs."gcc${gccMajorVersion}Stdenv"; passthruExtra = { - nixpkgsCompatibleLibstdcxx = lib.warn "cudaPackages.backendStdenv.nixpkgsCompatibleLibstdcxx is misnamed, deprecated, and will be removed after 24.05" cudaStdenv.cc.cxxStdlib.package; - # cc already exposed + # cudaPackages.backendStdenv.nixpkgsCompatibleLibstdcxx has been removed, + # if you need it you're likely doing something wrong. There has been a + # warning here for a month or so. Now we can no longer return any + # meaningful value in its place and drop the attribute entirely. }; assertCondition = true; in -# We should use libstdc++ at least as new as nixpkgs' stdenv's one. -assert let - cxxStdlibCuda = cudaStdenv.cc.cxxStdlib.package; - cxxStdlibNixpkgs = stdenv.cc.cxxStdlib.package; -in -((stdenv.cc.cxxStdlib.kind or null) == "libstdc++") --> lib.versionAtLeast cxxStdlibCuda.version cxxStdlibNixpkgs.version; + /* TODO: Consider testing whether we in fact use the newer libstdc++ */ lib.extendDerivation assertCondition passthruExtra cudaStdenv |