From ebeb2ff549618780c315efc7ac5dcd48d612cafe Mon Sep 17 00:00:00 2001 From: Aleix Roca Nonell Date: Tue, 31 Oct 2023 10:36:17 +0100 Subject: [PATCH] Set NOSV_HOME for clang wrapped with nodes This is needed since nosv must appear as a 1rst level dependency on the final executable. Clang will add the dependency as long as it knows where to find nosv (and nodes is used). Reviewed-By: Rodrigo Arias Mallo --- pkgs/llvm-ompss2/default.nix | 3 +++ pkgs/nodes/default.nix | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/pkgs/llvm-ompss2/default.nix b/pkgs/llvm-ompss2/default.nix index 07f6c9d..d35c706 100644 --- a/pkgs/llvm-ompss2/default.nix +++ b/pkgs/llvm-ompss2/default.nix @@ -46,5 +46,8 @@ in wrapCCWith { '' + lib.optionalString (ompss2rt != null) '' echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/cc-wrapper-hook echo "export ${homevar}=${ompss2rt}" >> $out/nix-support/cc-wrapper-hook + '' + lib.optionalString (ompss2rt != null && ompss2rt.pname == "nodes") '' + echo "export NOSV_HOME=${ompss2rt.nosv}" >> $out/nix-support/cc-wrapper-hook ''; } + diff --git a/pkgs/nodes/default.nix b/pkgs/nodes/default.nix index f75818f..672a43d 100644 --- a/pkgs/nodes/default.nix +++ b/pkgs/nodes/default.nix @@ -84,4 +84,8 @@ in nosv ovni ]; + + passthru = { + nosv = nosv; + }; }