diff options
| author | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-03-29 02:39:46 +0300 |
|---|---|---|
| committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-04-07 00:28:02 +0300 |
| commit | bd62420fd3873086cc5e369bbedaecc68caffeff (patch) | |
| tree | 7b018a1838fe96a796289593616a15301d5686d9 /pkgs/development/compilers/cudatoolkit/common.nix | |
| parent | 3cde9b5e4dbc83ea6ac3e9ff4fde8784a49eb5cb (diff) | |
| download | nixpkgs-bd62420fd3873086cc5e369bbedaecc68caffeff.tar nixpkgs-bd62420fd3873086cc5e369bbedaecc68caffeff.tar.gz nixpkgs-bd62420fd3873086cc5e369bbedaecc68caffeff.tar.bz2 nixpkgs-bd62420fd3873086cc5e369bbedaecc68caffeff.tar.lz nixpkgs-bd62420fd3873086cc5e369bbedaecc68caffeff.tar.xz nixpkgs-bd62420fd3873086cc5e369bbedaecc68caffeff.tar.zst nixpkgs-bd62420fd3873086cc5e369bbedaecc68caffeff.zip | |
cudaPackages: use same libstdc++ as the rest of nixpkgs
Diffstat (limited to 'pkgs/development/compilers/cudatoolkit/common.nix')
| -rw-r--r-- | pkgs/development/compilers/cudatoolkit/common.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 8082756b1ed..e4ad19406b7 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -29,6 +29,7 @@ args@ , python3 # FIXME: CUDAToolkit 10 may still need python27 , pulseaudio , requireFile +, stdenv , backendStdenv # E.g. gcc11Stdenv, set in extension.nix , unixODBC , wayland @@ -121,8 +122,8 @@ backendStdenv.mkDerivation rec { (placeholder "lib") (placeholder "out") "${placeholder "out"}/nvvm" - # Is it not handled by autoPatchelf automatically? - "${lib.getLib backendStdenv.cc.cc}/lib64" + # NOTE: use the same libstdc++ as the rest of nixpkgs, not from backendStdenv + "${lib.getLib stdenv.cc.cc}/lib64" "${placeholder "out"}/jre/lib/amd64/jli" "${placeholder "out"}/lib64" "${placeholder "out"}/nvvm/lib64" |