From 11a521ff51bc4618842f288c06d4fc20553d8b3c Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Wed, 2 Jun 2021 11:35:30 +0200
Subject: [PATCH] nanos6: allow the git url and branch to be specified

---
 bsc/nanos6/git.nix | 17 ++++++++++-------
 overlay.nix        |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bsc/nanos6/git.nix b/bsc/nanos6/git.nix
index 556fbd8..be6ff9a 100644
--- a/bsc/nanos6/git.nix
+++ b/bsc/nanos6/git.nix
@@ -11,9 +11,12 @@
 , extrae
 , boost
 , autoreconfHook
-, enableJemalloc ? false
+, enableJemalloc ? true
 , jemalloc ? null
 , cachelineBytes ? 64
+, enableGlibcxxDebug ? false
+, gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6"
+, gitBranch ? "master"
 }:
 
 with stdenv.lib;
@@ -21,11 +24,10 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "nanos6";
   version = "${src.shortRev}";
-  branch = "master";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/nanos6/nanos6";
-    ref = branch;
+    url = gitUrl;
+    ref = gitBranch;
   };
 
   prePatch = ''
@@ -37,11 +39,12 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export CACHELINE_WIDTH=${toString cachelineBytes}
     export NANOS6_GIT_VERSION=${src.rev}
-    export NANOS6_GIT_BRANCH=${branch}
+    export NANOS6_GIT_BRANCH=${gitBranch}
   '';
 
-  configureFlags = [] ++
-    optional enableJemalloc "--with-jemalloc=${jemalloc}";
+  configureFlags = []
+    ++ (optional enableJemalloc "--with-jemalloc=${jemalloc}")
+    ++ (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
 
   # The "bindnow" flags are incompatible with ifunc resolution mechanism. We
   # disable all by default, which includes bindnow.
diff --git a/overlay.nix b/overlay.nix
index fdf4849..b85d124 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -78,10 +78,12 @@ let
     nanos6 = bsc.nanos6Release;
     nanos6Release = callPackage ./bsc/nanos6/default.nix { };
     nanos6Git = callPackage ./bsc/nanos6/git.nix { };
+
     nanos6Debug = bsc.nanos6.overrideAttrs (old: {
       dontStrip = true;
       enableDebugging = true;
     });
+
     nanos6GlibcxxDebug = bsc.nanos6Debug.override {
       enableGlibcxxDebug = true;
     };