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;