Begin moving bsc packages to root attribute

bsc/llvm-ompss2/clang.nix

@@ -1,8 +1,7 @@
 {
-  stdenv
+  llvmPackages_latest
 , fetchFromGitHub
 , cmake
-, lld
 , bash
 , python3
 , perl
@@ -14,7 +13,9 @@
 , enableDebug ? false
 }:
 
-stdenv.mkDerivation rec {
+let
+  stdenv = llvmPackages_latest.stdenv;
+in stdenv.mkDerivation rec {
   version = "2023.05.1";
   pname = "clang-ompss2";
 
@@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
     python3
     perl
     cmake
-    lld
+    llvmPackages_latest.lld
     elfutils
     libffi
     pkg-config

bsc/llvm-ompss2/default.nix

@@ -1,10 +1,9 @@
 {
   stdenv
 , gcc
-, rt
 , clangOmpss2Unwrapped
 , wrapCCWith
-, llvmPackages
+, llvmPackages_latest
 }:
 
 
@@ -13,16 +12,12 @@ let
   # We need to replace the lld linker from bintools with our linker just built,
   # otherwise we run into incompatibility issues when mixing compiler and linker
   # versions.
-  bintools-unwrapped = llvmPackages.tools.bintools-unwrapped.override {
+  bintools-unwrapped = llvmPackages_latest.tools.bintools-unwrapped.override {
     lld = clangOmpss2Unwrapped;
   };
-  bintools = llvmPackages.tools.bintools.override {
+  bintools = llvmPackages_latest.tools.bintools.override {
     bintools = bintools-unwrapped;
   };
-
-  homevar = if rt.pname == "nanos6" then "NANOS6_HOME" else "NODES_HOME";
-  rtname = if rt.pname == "nanos6" then "libnanos6" else "libnodes";
-
   targetConfig = stdenv.targetPlatform.config;
   inherit gcc;
   cc = clangOmpss2Unwrapped;
@@ -43,10 +38,6 @@ in wrapCCWith {
 
     echo "--gcc-toolchain=${gcc}" >> $out/nix-support/cc-cflags
 
-    # Setup NANOS6_HOME or NODES_HOME, based on the runtime.
-    echo "export ${homevar}=${rt}" >> $out/nix-support/setup-hook
-    echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/setup-hook
-
     wrap clang++  $wrapper $ccPath/clang++
   '';
 }