From e0197950a6c041515c05f8299745bfe3c7a17297 Mon Sep 17 00:00:00 2001 From: Kevin Sala Date: Sun, 21 Mar 2021 17:54:37 +0100 Subject: [PATCH] ifsker: update app --- garlic/apps/ifsker/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/garlic/apps/ifsker/default.nix b/garlic/apps/ifsker/default.nix index 812f630..a6290c6 100644 --- a/garlic/apps/ifsker/default.nix +++ b/garlic/apps/ifsker/default.nix @@ -5,6 +5,7 @@ , tampi , nanos6 , mcxx +, gitBranch ? "garlic/mpi+isend+seq" }: with stdenv.lib; @@ -13,8 +14,8 @@ stdenv.mkDerivation rec { name = "ifsker"; src = builtins.fetchGit { - url = "ssh://git@bscpm03.bsc.es/ksala/ifsker.git"; - ref = "master"; + url = "ssh://git@bscpm03.bsc.es/garlic/apps/ifsker.git"; + ref = gitBranch; }; buildInputs = [ tampi mpi nanos6 mcxx gfortran ]; @@ -41,10 +42,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp *.bin $out/bin/ + cp ${name} $out/bin/ + + mkdir -p $out/etc + cp -r data $out/etc/ + cp nanos6.toml $out/etc ''; - # TODO: Split the app into variants - programPath = "/bin/03.ifsker.mpi.ompss2.tasks.bin"; + programPath = "/bin/${name}"; }