From 2a953d811c1e10d8d32b17a39e6eaf1b58afcd46 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Wed, 29 Nov 2023 16:59:20 +0100 Subject: [PATCH] Build TAMPI with ovni support By default we build TAMPI with ovni support, as it will be disabled in runtime unless explicitly enabled by the TAMPI_INSTRUMENT=ovni environment variable. Reviewed-by: Aleix Roca Nonell --- pkgs/tampi/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tampi/default.nix b/pkgs/tampi/default.nix index 1c25b6c..c99cd4c 100644 --- a/pkgs/tampi/default.nix +++ b/pkgs/tampi/default.nix @@ -1,5 +1,6 @@ { stdenv +, lib , fetchFromGitHub , automake , autoconf @@ -9,12 +10,18 @@ , mpi , gcc , autoreconfHook +, enableOvni ? true +, ovni ? null , useGit ? false , gitUrl ? "ssh://git@bscpm03.bsc.es/interoperability/tampi.git" , gitBranch ? "master" , gitCommit ? "16f92094ca6da25e2f561c000f5fbc2901944f7b" }: +with lib; + +assert enableOvni -> (ovni != null); + let release = rec { version = "3.0"; @@ -48,7 +55,8 @@ in stdenv.mkDerivation rec { boost mpi gcc - ]; + ] ++ optional (enableOvni) ovni; + configureFlags = optional (enableOvni) "--with-ovni=${ovni}"; dontDisableStatic = true; hardeningDisable = [ "all" ]; }