diff --git a/bsc/ctfast/default.nix b/bsc/cn6/default.nix similarity index 69% rename from bsc/ctfast/default.nix rename to bsc/cn6/default.nix index 4988a68..3456a00 100644 --- a/bsc/ctfast/default.nix +++ b/bsc/cn6/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - pname = "ctfast"; + pname = "cn6"; version = "${src.shortRev}"; buildInputs = [ @@ -16,18 +16,18 @@ stdenv.mkDerivation rec { ]; src = builtins.fetchGit { - url = "ssh://git@bscpm03.bsc.es/rarias/ctfast.git"; + url = "ssh://git@bscpm03.bsc.es/rarias/cn6.git"; ref = "master"; }; # Fix the search path configurePhase = '' - sed -i "s@^CTFPLUGINS=.*@CTFPLUGINS=$out/lib/nanos6@" ctfast2prv + sed -i "s@^PRV_LIB_PATH=.*@PRV_LIB_PATH=$out/lib/nanos6@" Makefile ''; installPhase = '' mkdir -p $out/bin - cp ctfast2prv $out/bin + cp cn6 $out/bin mkdir -p $out/lib/nanos6 cp prv.so $out/lib/nanos6/ diff --git a/garlic/shell.nix b/garlic/shell.nix index f45b8b4..4bd1fc3 100644 --- a/garlic/shell.nix +++ b/garlic/shell.nix @@ -10,7 +10,7 @@ mkShell { # Packages from garlic (with garlic; [ tool garlicd ]) ++ # Packages from bsc - [ groff paraver icc nix openssh git ]; + [ groff paraver icc nix openssh git cn6 ]; # inputsFrom to get build dependencies diff --git a/overlay.nix b/overlay.nix index d7e3437..e44aa0f 100644 --- a/overlay.nix +++ b/overlay.nix @@ -151,7 +151,7 @@ let systemtap = self.linuxPackages_4_9.systemtap; }; - ctfast = callPackage ./bsc/ctfast/default.nix { }; + cn6 = callPackage ./bsc/cn6/default.nix { }; # ================================================================= # MN4 specific