diff options
| author | github-actions[bot] | 2024-07-23 12:01:18 +0000 |
|---|---|---|
| committer | GitHub | 2024-07-23 12:01:18 +0000 |
| commit | d284ef371ef0ad8e60c6c69ca3b1b06b06432b00 (patch) | |
| tree | dfc598788b149d550607a886d3c71de82834fa0c /pkgs/development/cuda-modules | |
| parent | b53c4a352d7f5686a1f74e9842374fb88cf66c5d (diff) | |
| parent | 65f98a6801b89162cd0cf3b0f4be53c62b6811f2 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/cuda-modules')
| -rw-r--r-- | pkgs/development/cuda-modules/cuda/overrides.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 46e4401f6a26..3970830e7567 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -156,13 +156,17 @@ filterAndCreateOverrides { { cudaAtLeast, gmp, + expat, + stdenv, lib, }: prevAttrs: { buildInputs = prevAttrs.buildInputs # x86_64 only needs gmp from 12.0 and on - ++ lib.lists.optionals (cudaAtLeast "12.0") [ gmp ]; + ++ lib.lists.optionals (cudaAtLeast "12.0") [ gmp ] + # aarch64,sbsa needs expat + ++ lib.lists.optionals (stdenv.hostPlatform.isAarch64) [ expat ]; }; cuda_nvcc = |