From 114a6b081ffdd1536dd5e1553f7cf49629f6e54c Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 10 Jul 2020 13:17:45 +0200
Subject: [PATCH] Add icc in mcxx to enable imc* wrappers

---
 bsc/mcxx/default.nix | 2 ++
 default.nix          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bsc/mcxx/default.nix b/bsc/mcxx/default.nix
index 511ea1e..e021e17 100644
--- a/bsc/mcxx/default.nix
+++ b/bsc/mcxx/default.nix
@@ -10,6 +10,7 @@
 , flex
 , bison
 , gcc
+, icc
 }:
 
 stdenv.mkDerivation rec {
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
     bison
     flex
     gcc
+    icc
   ];
 
   configureFlags = [
diff --git a/default.nix b/default.nix
index 9549f1a..87c3837 100644
--- a/default.nix
+++ b/default.nix
@@ -36,6 +36,7 @@ let
     };
 
     # Default Intel MPI version is 2019 (the last one)
+    impi = intel-mpi;
     intel-mpi = intel-mpi-2019;
     intel-mpi-2019 = callPackage ./bsc/intel-mpi/default.nix {
       # Intel MPI provides a debug version of the MPI library, but
@@ -70,6 +71,7 @@ let
     };
 
     mcxx = callPackage ./bsc/mcxx/default.nix {
+      icc = icc;
       stdenv = pkgs.gcc9Stdenv;
       nanos6 = nanos6-git;
     };