From 99b716db87f9b33ed5a8c6eb01d03ea4fa9f963a Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Mon, 13 Jul 2020 14:07:24 +0200 Subject: [PATCH] icc: Propagate gcc as is required to build --- bsc/intel-compiler/default.nix | 3 +++ bsc/intel-compiler/icc2020.nix | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/bsc/intel-compiler/default.nix b/bsc/intel-compiler/default.nix index 946fa24..2c6f82b 100644 --- a/bsc/intel-compiler/default.nix +++ b/bsc/intel-compiler/default.nix @@ -20,6 +20,9 @@ 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 + cat "${icc-unwrapped}/nix-support/propagated-build-inputs" >> \ + $out/nix-support/propagated-build-inputs + echo "export INTEL_LICENSE_FILE=${intel-license}" \ >> $out/nix-support/setup-hook diff --git a/bsc/intel-compiler/icc2020.nix b/bsc/intel-compiler/icc2020.nix index 08c6906..b25ee37 100644 --- a/bsc/intel-compiler/icc2020.nix +++ b/bsc/intel-compiler/icc2020.nix @@ -28,9 +28,13 @@ stdenv.mkDerivation rec { rpmextract autoPatchelfHook gcc.cc.lib + gcc intel-mpi ]; + # The gcc package is required for building other programs + propagatedBuildInputs = [ gcc ]; + installPhase = '' rpmextract rpm/intel-icc-*.rpm rpmextract rpm/intel-comp-*.rpm