From 940c494d8ed7411971278abb4a49150cb693bcf4 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 2 Jul 2020 15:32:52 +0200
Subject: [PATCH] Use last intel compiler 2020 version

---
 bsc/intel-compiler/default.nix              | 4 ++--
 bsc/intel-compiler/{icc.nix => icc2020.nix} | 4 ++--
 default.nix                                 | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename bsc/intel-compiler/{icc.nix => icc2020.nix} (94%)

diff --git a/bsc/intel-compiler/default.nix b/bsc/intel-compiler/default.nix
index f9964a8..e51f63d 100644
--- a/bsc/intel-compiler/default.nix
+++ b/bsc/intel-compiler/default.nix
@@ -5,7 +5,7 @@
 , icc-unwrapped
 , wrapCCWith
 , libstdcxxHook
-, intel-license
+, icc-license
 }:
 
 let
@@ -19,7 +19,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=${intel-license}" \
+    echo "export INTEL_LICENSE_FILE=${icc-license}" \
       >> $out/nix-support/setup-hook
 
     # Create the wrappers for icc and icpc
diff --git a/bsc/intel-compiler/icc.nix b/bsc/intel-compiler/icc2020.nix
similarity index 94%
rename from bsc/intel-compiler/icc.nix
rename to bsc/intel-compiler/icc2020.nix
index 620e3dc..b830d8e 100644
--- a/bsc/intel-compiler/icc.nix
+++ b/bsc/intel-compiler/icc2020.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2019.1.217";
+  version = "${year}.${v_a}.${v_b}";
   name = "intel-compiler-${version}";
 
   # From Arch Linux PKGBUILD
-  dir_nr="16526";
+  dir_nr="16527";
   year="2020";
   v_a="1";
   v_b="217";
diff --git a/default.nix b/default.nix
index ec25a8a..82c866c 100644
--- a/default.nix
+++ b/default.nix
@@ -43,11 +43,15 @@ let
       enableDebug = false;
     };
 
-    icc-unwrapped = callPackage ./bsc/intel-compiler/icc.nix {
+    # By default we use Intel compiler 2020 update 1
+    icc-unwrapped = icc2020-unwrapped;
+    icc2020-unwrapped = callPackage ./bsc/intel-compiler/icc2020.nix {
     };
 
+    # 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 {
-      intel-license = icc-license;
+      inherit icc-unwrapped icc-license;
     };
 
     icc-license = callPackage bsc/intel-compiler/license.nix {