diff options
| author | Yann Hamdaoui <yann.hamdaoui@tweag.io> | 2024-01-17 16:32:24 +0100 |
|---|---|---|
| committer | Yann Hamdaoui <yann.hamdaoui@tweag.io> | 2024-03-15 15:54:21 +0100 |
| commit | 63746cac08fe242003947167550d28ebc182bf77 (patch) | |
| tree | 54e1172b75850dfdd823f7fa94601e9e495c402a /pkgs/development/cuda-modules/cuda-samples | |
| parent | 6a9c892aec57608b49c5ffc524629a3550e8efe6 (diff) | |
cudaPackages: generalize and refactor setup hook
This PR refactor CUDA setup hooks, and in particular
autoAddOpenGLRunpath and autoAddCudaCompatRunpathHook, that were using a
lot of code in common (in fact, I introduced the latter by copy pasting
most of the bash script of the former). This is not satisfying for
maintenance, as a recent patch showed, because we need to duplicate
changes to both hooks.
This commit abstract the common part in a single shell script that
applies a generic patch action to every elf file in the output. For
autoAddOpenGLRunpath the action is just addOpenGLRunpath (now
addDriverRunpath), and is few line function for
autoAddCudaCompatRunpathHook.
Doing so, we also takes the occasion to use the newer addDriverRunpath
instead of the previous addOpenGLRunpath, and rename the CUDA hook to
reflect that as well.
Co-Authored-By: Connor Baker <connor.baker@tweag.io>
Diffstat (limited to 'pkgs/development/cuda-modules/cuda-samples')
| -rw-r--r-- | pkgs/development/cuda-modules/cuda-samples/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/cuda-modules/cuda-samples/generic.nix b/pkgs/development/cuda-modules/cuda-samples/generic.nix index fb3d7cc99da9..3d1dac015e16 100644 --- a/pkgs/development/cuda-modules/cuda-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-samples/generic.nix @@ -1,5 +1,5 @@ { - autoAddOpenGLRunpathHook, + autoAddDriverRunpath, backendStdenv, cmake, cudatoolkit, @@ -31,7 +31,7 @@ backendStdenv.mkDerivation ( nativeBuildInputs = [ - autoAddOpenGLRunpathHook + autoAddDriverRunpath pkg-config ] # CMake has to run as a native, build-time dependency for libNVVM samples. |