diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-20 00:02:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-20 00:02:08 +0000 |
| commit | a474411771523ecb4092d05e6dfa1a47c4a85791 (patch) | |
| tree | c81159f89aa41d27b2fb551afc9dc92b36184824 /pkgs/applications/science | |
| parent | 5ce921d6d220c647ab27d4b3a6d253803b9f7be0 (diff) | |
| parent | cdd619c9ebf214e487a2621ef59052644618dd0e (diff) | |
| download | nixlib-a474411771523ecb4092d05e6dfa1a47c4a85791.tar nixlib-a474411771523ecb4092d05e6dfa1a47c4a85791.tar.gz nixlib-a474411771523ecb4092d05e6dfa1a47c4a85791.tar.bz2 nixlib-a474411771523ecb4092d05e6dfa1a47c4a85791.tar.lz nixlib-a474411771523ecb4092d05e6dfa1a47c4a85791.tar.xz nixlib-a474411771523ecb4092d05e6dfa1a47c4a85791.tar.zst nixlib-a474411771523ecb4092d05e6dfa1a47c4a85791.zip | |
Merge master into staging-next
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 = { |