diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-21 19:59:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-21 19:59:16 +0200 |
commit | ec21df329aef9b299dcedd46cc5901c670ac2726 (patch) | |
tree | 9311b016fd43ed4c6e0caf0305d1a4cf28d9be5a /pkgs/top-level | |
parent | e7593313a62984ee2fd9b12f60fbb1e008f2ada5 (diff) | |
parent | 3c41d61514029d5aa4ea748c1e46098767ae448b (diff) | |
download | nixlib-ec21df329aef9b299dcedd46cc5901c670ac2726.tar nixlib-ec21df329aef9b299dcedd46cc5901c670ac2726.tar.gz nixlib-ec21df329aef9b299dcedd46cc5901c670ac2726.tar.bz2 nixlib-ec21df329aef9b299dcedd46cc5901c670ac2726.tar.lz nixlib-ec21df329aef9b299dcedd46cc5901c670ac2726.tar.xz nixlib-ec21df329aef9b299dcedd46cc5901c670ac2726.tar.zst nixlib-ec21df329aef9b299dcedd46cc5901c670ac2726.zip |
Merge pull request #85636 from matthewbauer/blas-lapack-fix-fallout-from-83888
BLAS/LAPACK fix fallout from #83888
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/release-alternatives.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index eef239d4e0a8..7479377bd302 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -59,7 +59,7 @@ in { blas = mapListToAttrs supportedSystems (system': let system = lib.systems.elaborate { system = system'; }; in mapListToAttrs (blasProviders system) (provider: let - is64bit = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); + isILP64 = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); pkgs = pkgsFun { config = { inherit allowUnfree; }; system = system'; @@ -68,13 +68,13 @@ in lapackProvider = if provider == "mkl64" then super.mkl else builtins.getAttr provider super; - inherit is64bit; + inherit isILP64; }; blas = super.blas.override { blasProvider = if provider == "mkl64" then super.mkl else builtins.getAttr provider super; - inherit is64bit; + inherit isILP64; }; })]; }; |