diff options
Diffstat (limited to 'pkgs/development/compilers/cudatoolkit')
3 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 1f934ef5d46..681549fa62d 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -361,7 +361,7 @@ backendStdenv.mkDerivation rec { description = "A compiler for NVIDIA GPUs, math libraries, and tools"; homepage = "https://developer.nvidia.com/cuda-toolkit"; platforms = [ "x86_64-linux" ]; - license = licenses.unfree; + license = licenses.nvidiaCuda; maintainers = teams.cuda.members; }; } diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 038841a7097..1e4a3ab1785 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -39,7 +39,7 @@ let inherit (lib.meta) getExe; inherit (lib.strings) optionalString; in -backendStdenv.mkDerivation { +backendStdenv.mkDerivation (finalAttrs: { # NOTE: Even though there's no actual buildPhase going on here, the derivations of the # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are @@ -164,11 +164,15 @@ backendStdenv.mkDerivation { outputSpecified = true; meta = { - inherit description platforms; - license = lib.licenses.unfree; + inherit platforms; + description = "${description}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}"; + license = lib.licenses.nvidiaCudaRedist // { + url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.license_path or "${pname}/LICENSE.txt"}"; + }; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = lib.teams.cuda.members; # Force the use of the default, fat output by default (even though `dev` exists, which # causes Nix to prefer that output over the others if outputSpecified isn't set). outputsToInstall = [ "out" ]; }; -} +}) diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 58f2b205dd5..ea6fd581cde 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -89,9 +89,9 @@ let in { # features : Attr Set (String PackageFeatureAttrs) - features = processManifest ./manifests/redistrib_features_${fullCudaVersion}.json; + features = processManifest (./manifests + "/redistrib_features_${fullCudaVersion}.json"); # manifest : Attr Set (String PackageAttrs) - manifest = processManifest ./manifests/redistrib_${fullCudaVersion}.json; + manifest = processManifest (./manifests + "/redistrib_${fullCudaVersion}.json"); }; # Function to build a single redist package |