From 9a500dd3d6a9da27b599b4745e36da6fb7a1a578 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 19 May 2023 18:32:35 +0200
Subject: [PATCH] Update Nanos6 git with ./autogen.sh

---
 bsc/nanos6/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bsc/nanos6/git.nix b/bsc/nanos6/git.nix
index 1e2cc09..b512eff 100644
--- a/bsc/nanos6/git.nix
+++ b/bsc/nanos6/git.nix
@@ -10,7 +10,6 @@
 , hwloc
 , papi
 , boost
-, autoreconfHook
 , enableJemalloc ? true
 , jemalloc ? null
 , cachelineBytes ? 64
@@ -32,6 +31,7 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     patchShebangs scripts/generate_config.sh
+    patchShebangs autogen.sh
   '';
 
   enableParallelBuilding = true;
@@ -41,9 +41,10 @@ stdenv.mkDerivation rec {
     export CACHELINE_WIDTH=${toString cachelineBytes}
     export NANOS6_GIT_VERSION=${src.rev}
     export NANOS6_GIT_BRANCH=${gitBranch}
+    ./autogen.sh
   '';
 
-  configureFlags = []
+  configureFlags = [ "--with-hwloc=${hwloc}" ]
     ++ (optional enableJemalloc "--with-jemalloc=${jemalloc}")
     ++ (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
 
@@ -52,7 +53,6 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "all" ];
 
   buildInputs = [
-    autoreconfHook
     autoconf
     automake
     libtool