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/applications/science | |
| parent | 6a9c892aec57608b49c5ffc524629a3550e8efe6 (diff) | |
| download | nixlib-63746cac08fe242003947167550d28ebc182bf77.tar nixlib-63746cac08fe242003947167550d28ebc182bf77.tar.gz nixlib-63746cac08fe242003947167550d28ebc182bf77.tar.bz2 nixlib-63746cac08fe242003947167550d28ebc182bf77.tar.lz nixlib-63746cac08fe242003947167550d28ebc182bf77.tar.xz nixlib-63746cac08fe242003947167550d28ebc182bf77.tar.zst nixlib-63746cac08fe242003947167550d28ebc182bf77.zip | |
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/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/colmap/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/molecular-dynamics/lammps/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index a029f5440b25..64a7952be4cc 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; meta = with lib; { diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index db27bb188cf5..4c2a80c2f1b7 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config # Although not always needed, it is needed if cmakeFlags include # GPU_API=cuda, and it doesn't users that don't enable the GPU package. - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; passthru = { |