rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cn6: update name and add to the shell

Browse Source
This commit is contained in:
Rodrigo Arias 2021-02-15 17:44:20 +01:00
parent 0ee2747215
commit 243d022620
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bsc/ctfast/default.nix → bsc/cn6/default.nix
View File

@ -6,7 +6,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ctfast"; pname = "cn6";
version = "${src.shortRev}"; version = "${src.shortRev}";
buildInputs = [ buildInputs = [
@ -16,18 +16,18 @@ stdenv.mkDerivation rec {
]; ];
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@bscpm03.bsc.es/rarias/ctfast.git"; url = "ssh://git@bscpm03.bsc.es/rarias/cn6.git";
ref = "master"; ref = "master";
}; };
# Fix the search path # Fix the search path
configurePhase = '' configurePhase = ''
sed -i "s@^CTFPLUGINS=.*@CTFPLUGINS=$out/lib/nanos6@" ctfast2prv sed -i "s@^PRV_LIB_PATH=.*@PRV_LIB_PATH=$out/lib/nanos6@" Makefile
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp ctfast2prv $out/bin cp cn6 $out/bin
mkdir -p $out/lib/nanos6 mkdir -p $out/lib/nanos6
cp prv.so $out/lib/nanos6/ cp prv.so $out/lib/nanos6/

2
garlic/shell.nix
View File

@ -10,7 +10,7 @@ mkShell {
# Packages from garlic # Packages from garlic
(with garlic; [ tool garlicd ]) ++ (with garlic; [ tool garlicd ]) ++
# Packages from bsc # Packages from bsc
[ groff paraver icc nix openssh git ]; [ groff paraver icc nix openssh git cn6 ];
# inputsFrom to get build dependencies # inputsFrom to get build dependencies

2
overlay.nix
View File

@ -151,7 +151,7 @@ let
systemtap = self.linuxPackages_4_9.systemtap; systemtap = self.linuxPackages_4_9.systemtap;
}; };
ctfast = callPackage ./bsc/ctfast/default.nix { }; cn6 = callPackage ./bsc/cn6/default.nix { };
# ================================================================= # =================================================================
# MN4 specific # MN4 specific