diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-27 10:13:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 10:13:05 +0100 |
| commit | 2ee93d61ad2220199e8116526d485a8e23e9aee5 (patch) | |
| tree | 9bf733fe5fd9491f568709bb6511e9536a0b05f2 /pkgs/development/libraries/science/math/mkl | |
| parent | b58f10c3ba10d20f246b668a49a99fb2cfd11b7f (diff) | |
| parent | 36c91cea1dbe396b92b20bdab3d0d7ad2f294eeb (diff) | |
Merge pull request #110913 from siraben/other-stdenv-lib
Diffstat (limited to 'pkgs/development/libraries/science/math/mkl')
| -rw-r--r-- | pkgs/development/libraries/science/math/mkl/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index b631def3bb2e..34fea3162a9c 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , callPackage , stdenvNoCC , fetchurl @@ -135,7 +136,7 @@ in stdenvNoCC.mkDerivation { ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt} - '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3" @@ -145,7 +146,7 @@ in stdenvNoCC.mkDerivation { # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool # explicitly and ignore the error. - postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' + postFixup = lib.optionalString stdenvNoCC.isDarwin '' for f in $out/lib/*.dylib; do install_name_tool -id $out/lib/$(basename $f) $f || true done @@ -160,7 +161,7 @@ in stdenvNoCC.mkDerivation { passthru.tests.pkg-config = callPackage ./test { }; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Intel Math Kernel Library"; longDescription = '' Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort |