From e48abe92fdff087e6e6755edab9ccd2fe0166b8d Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 20 Jan 2024 17:22:42 +0000 Subject: [PATCH] cudaPackages.cuda_nvcc: back-end cc already exposes the c++ stdlib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unbreaks evaluation after the refactoring in 86c28ee650c4393ec1b6f8815a0e1ddc010cd6cb (https://github.com/NixOS/nixpkgs/pull/282220). Explicitly extending nvcc's LIBRARIES may have been redundant (building something mildly cursed like jaxlib may be necessary to verify) Previously: ``` ❯ NIXPKGS_ALLOW_UNFREE=1 nix-instantiate '.' -A tests.cuda ... error: necessary to fix CI ❯ nix build -f '.' --arg config '{ allowUnfree = true; }' -L python3Packages.torchWithCuda ... error: necessary to fix CI ``` Now: ``` ❯ NIXPKGS_ALLOW_UNFREE=1 nix-instantiate '.' -A tests.cuda /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-cuda-samples-12.2.drv /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-saxpy-unstable-2023-07-11.drv ... ``` --- pkgs/development/cuda-modules/cuda/overrides.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 69ddab17bac3..f43d649afbbf 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -112,7 +112,6 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) { useCcForLibs = true; gccForLibs = ccForLibs-wrapper.cc; }; - cxxStdlibDir = ccForLibs-wrapper.cxxStdlib.solib or (throw "necessary to fix CI"); in { @@ -149,7 +148,6 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) { # Fix a compatible backend compiler PATH += ${lib.getBin cc}/bin: - LIBRARIES += "-L${cxxStdlibDir}/lib" # Expose the split-out nvvm LIBRARIES =+ -L''${!outputBin}/nvvm/lib