From d031523a012688079e3bef68abaab2f8c5d099af Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 4 Dec 2023 20:40:34 +0000 Subject: [PATCH] cudaPackages.cuda_nvcc: fix hook's offsets (-1, -1) -> (-1, 0) Cf. explanations in https://github.com/NixOS/nixpkgs/pull/271078 --- .../compilers/cudatoolkit/redist/overrides.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 16b03b93b1db..71e70e8d7b70 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -52,18 +52,7 @@ in ); cuda_nvcc = prev.cuda_nvcc.overrideAttrs (oldAttrs: { - # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to - # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the - # setupCudaHook, i.e. we want it the hook to be propagated into the - # same nativeBuildInputs. - # - # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, - # so that the final offsets for the propagated hook would be `(-1, 0) + - # (0, 0) = (-1, 0)`. - # - # In practice, TargetTarget appears to work: - # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 - depsTargetTargetPropagated = [ + propagatedBuildInputs = [ final.setupCudaHook ];