icc: Propagate gcc as is required to build

This commit is contained in:
Rodrigo Arias 2020-07-13 14:07:24 +02:00
parent a78f0caec9
commit 99b716db87
2 changed files with 7 additions and 0 deletions

View File

@ -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/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
echo "-L${gcc.cc.lib}/lib" >> $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}" \ echo "export INTEL_LICENSE_FILE=${intel-license}" \
>> $out/nix-support/setup-hook >> $out/nix-support/setup-hook

View File

@ -28,9 +28,13 @@ stdenv.mkDerivation rec {
rpmextract rpmextract
autoPatchelfHook autoPatchelfHook
gcc.cc.lib gcc.cc.lib
gcc
intel-mpi intel-mpi
]; ];
# The gcc package is required for building other programs
propagatedBuildInputs = [ gcc ];
installPhase = '' installPhase = ''
rpmextract rpm/intel-icc-*.rpm rpmextract rpm/intel-icc-*.rpm
rpmextract rpm/intel-comp-*.rpm rpmextract rpm/intel-comp-*.rpm