From 261d304961f20f095fb9ef3ac2961674c590fdd9 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 10 Jul 2020 13:42:55 +0200
Subject: [PATCH] Add ifort to intel compilers

---
 bsc/intel-compiler/default.nix | 4 ++--
 bsc/intel-compiler/icc2020.nix | 3 +++
 default.nix                    | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bsc/intel-compiler/default.nix b/bsc/intel-compiler/default.nix
index ff2336c..1a5dd83 100644
--- a/bsc/intel-compiler/default.nix
+++ b/bsc/intel-compiler/default.nix
@@ -5,7 +5,7 @@
 , icc-unwrapped
 , wrapCCWith
 , libstdcxxHook
-, icc-license
+, intel-license
 }:
 
 let
@@ -18,7 +18,7 @@ in wrapCCWith rec {
     echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
     echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
 
-    echo "export INTEL_LICENSE_FILE=${icc-license}" \
+    echo "export INTEL_LICENSE_FILE=${intel-license}" \
       >> $out/nix-support/setup-hook
 
     # Create the wrappers for icc and icpc
diff --git a/bsc/intel-compiler/icc2020.nix b/bsc/intel-compiler/icc2020.nix
index b830d8e..6d92011 100644
--- a/bsc/intel-compiler/icc2020.nix
+++ b/bsc/intel-compiler/icc2020.nix
@@ -3,6 +3,7 @@
 , rpmextract
 , autoPatchelfHook
 , gcc
+, intel-mpi
 }:
 
 stdenv.mkDerivation rec {
@@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
     rpmextract
     autoPatchelfHook
     gcc.cc.lib
+    intel-mpi
   ];
 
   installPhase = ''
@@ -34,6 +36,7 @@ stdenv.mkDerivation rec {
     rpmextract rpm/intel-comp-*.rpm
     rpmextract rpm/intel-c-comp-*.rpm
     rpmextract rpm/intel-openmp*.rpm
+    rpmextract rpm/intel-ifort*.rpm
 
     mkdir -p $out/{bin,lib,include}
 
diff --git a/default.nix b/default.nix
index 87c3837..1e10e04 100644
--- a/default.nix
+++ b/default.nix
@@ -47,15 +47,16 @@ let
     # By default we use Intel compiler 2020 update 1
     icc-unwrapped = icc2020-unwrapped;
     icc2020-unwrapped = callPackage ./bsc/intel-compiler/icc2020.nix {
+      intel-mpi = intel-mpi-2019;
     };
 
     # A wrapper script that puts all the flags and environment vars properly and
     # calls the intel compiler binary
     icc = callPackage bsc/intel-compiler/default.nix {
-      inherit icc-unwrapped icc-license;
+      inherit icc-unwrapped intel-license;
     };
 
-    icc-license = callPackage bsc/intel-compiler/license.nix {
+    intel-license = callPackage bsc/intel-compiler/license.nix {
     };
 
     fftw = callPackage ./bsc/fftw/default.nix {