Merge bscpkgs into jungle #189

Manually merged
rarias merged 1013 commits from merge-bscpkgs into master 2025-10-07 16:12:34 +02:00
2 changed files with 7 additions and 0 deletions
Showing only changes of commit 99b716db87 - Show all commits

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}/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

View File

@@ -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