summary refs log tree commit diff
path: root/pkgs/development/libraries/science
diff options
context:
space:
mode:
authorRoberto Di Remigio <roberto.diremigio@gmail.com>2019-12-11 20:49:49 +0100
committerRoberto Di Remigio <roberto.diremigio@gmail.com>2019-12-19 10:12:00 +0100
commite0605b3174f4d786368f5cfc2086a74e66c3cc34 (patch)
tree629d37f94e2ebb7899b909edaddb12eb08d0a5ba /pkgs/development/libraries/science
parentcbd67719fdb0632141d57bcfb73f6e207e2a0b2d (diff)
downloadnixpkgs-e0605b3174f4d786368f5cfc2086a74e66c3cc34.tar
nixpkgs-e0605b3174f4d786368f5cfc2086a74e66c3cc34.tar.gz
nixpkgs-e0605b3174f4d786368f5cfc2086a74e66c3cc34.tar.bz2
nixpkgs-e0605b3174f4d786368f5cfc2086a74e66c3cc34.tar.lz
nixpkgs-e0605b3174f4d786368f5cfc2086a74e66c3cc34.tar.xz
nixpkgs-e0605b3174f4d786368f5cfc2086a74e66c3cc34.tar.zst
nixpkgs-e0605b3174f4d786368f5cfc2086a74e66c3cc34.zip
mkl: add GNU threading and Fortran libraries
Signed-off-by: Roberto Di Remigio <roberto.diremigio@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/science')
-rw-r--r--pkgs/development/libraries/science/math/mkl/default.nix17
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 382d2c303e3..08644f7c2ef 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -46,10 +46,23 @@ in stdenvNoCC.mkDerivation {
       tar xzvf $f
     done
   '' else ''
-    rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm
+    # Common stuff
     rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm
-    rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm
+    rpmextract rpm/intel-mkl-common-f-${rpm-ver}.noarch.rpm
+
+    # Dynamic libraries
+    rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm
     rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm
+    rpmextract rpm/intel-mkl-gnu-f-rt-${rpm-ver}.x86_64.rpm
+    rpmextract rpm/intel-mkl-gnu-rt-${rpm-ver}.x86_64.rpm
+
+    # Static libraries
+    rpmextract rpm/intel-mkl-cluster-${rpm-ver}.x86_64.rpm
+    rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm
+    rpmextract rpm/intel-mkl-gnu-${rpm-ver}.x86_64.rpm
+    rpmextract rpm/intel-mkl-gnu-f-${rpm-ver}.x86_64.rpm
+
+    # Intel OpenMP runtime
     rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm
   '';