From 3b21a32d835ff06741d5d59cd023ff2ae1ecb19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Pe=C3=B1acoba?= <rpenacob@bsc.es>
Date: Fri, 12 Jan 2024 17:28:22 +0100
Subject: [PATCH] Add ovni to OpenMP-V

Allows building OpenMP-V with ovni support, which is neccessary to run
the runtime tests of OpenMP-V in ovni.

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
---
 overlay.nix                 | 2 +-
 pkgs/llvm-ompss2/openmp.nix | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/overlay.nix b/overlay.nix
index 77390ec..32691d1 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -31,7 +31,7 @@ let
     nodes = callPackage ./pkgs/nodes/default.nix { };
     nosv = callPackage ./pkgs/nosv/default.nix { };
     openmp = callPackage ./pkgs/llvm-ompss2/openmp.nix { monorepoSrc = final.clangOmpss2Unwrapped.src; version = final.clangOmpss2Unwrapped.version; };
-    openmpv = final.openmp.override { enableNosv = true; };
+    openmpv = final.openmp.override { enableNosv = true; enableOvni = true; };
     osumb = callPackage ./pkgs/osu/default.nix { };
     ovni = callPackage ./pkgs/ovni/default.nix { };
     ovniGit = final.ovni.override { useGit = true; };
diff --git a/pkgs/llvm-ompss2/openmp.nix b/pkgs/llvm-ompss2/openmp.nix
index 654294b..aee98e9 100644
--- a/pkgs/llvm-ompss2/openmp.nix
+++ b/pkgs/llvm-ompss2/openmp.nix
@@ -9,10 +9,14 @@
 , pkg-config
 , version
 , nosv
+, ovni
 , enableNosv ? false
 , enableDebug ? false
+, enableOvni ? false
 }:
 
+assert enableOvni -> enableNosv;
+
 let
   stdenv = llvmPackages_latest.stdenv;
 in
@@ -35,6 +39,8 @@ stdenv.mkDerivation rec {
     pkg-config
   ] ++ lib.optionals enableNosv [
     nosv
+  ] ++ lib.optionals enableOvni [
+    ovni
   ];
 
   doCheck = false;