diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
| commit | 56e87d10ec12e00eab5c4b5710e01ab50eec267f (patch) | |
| tree | baff33c3da97619d02441379b3f0f369da8f3d5a /nixpkgs/pkgs/development/libraries/science | |
| parent | cc14c6e02d8424c1d446d248f71e08243181af8d (diff) | |
| parent | 3a2786eea085f040a66ecde1bc3ddc7099f6dbeb (diff) | |
| download | nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.gz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.bz2 nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.lz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.xz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.zst nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/science')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index db85bfdd9c0b..b1e03e35df12 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -31,12 +31,6 @@ assert useCudatoolkitRunfile || (libcublas != null); let # versionTriple :: String # Version with three components: major.minor.patch versionTriple = majorMinorPatch version; - - # cudatoolkit_root :: Derivation - cudatoolkit_root = - if useCudatoolkitRunfile - then cudatoolkit - else libcublas; in backendStdenv.mkDerivation { pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; @@ -65,7 +59,10 @@ in stdenv.cc.cc.lib zlib - cudatoolkit_root + ] ++ lists.optionals useCudatoolkitRunfile [ + cudatoolkit + ] ++ lists.optionals (!useCudatoolkitRunfile) [ + libcublas.lib ]; # We used to patch Runpath here, but now we use autoPatchelfHook |