From 5d3820631a893018a084b947c5d72513d1a0c4ac Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 12 Apr 2024 14:54:35 +0200
Subject: [PATCH] Fix Nanos6 4.0 build

It looks like after upgrading the compiler the build breaks. The patch
simply adds the missing cstdint include, until a new release is made.

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
---
 .../0001-Add-missing-cstdint-include.patch    | 32 +++++++++++++++++++
 pkgs/nanos6/default.nix                       |  9 ++++--
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/nanos6/0001-Add-missing-cstdint-include.patch

diff --git a/pkgs/nanos6/0001-Add-missing-cstdint-include.patch b/pkgs/nanos6/0001-Add-missing-cstdint-include.patch
new file mode 100644
index 0000000..a4b1fd3
--- /dev/null
+++ b/pkgs/nanos6/0001-Add-missing-cstdint-include.patch
@@ -0,0 +1,32 @@
+From 6fc5bef066ac011d6b15a7c090f4498b0b730818 Mon Sep 17 00:00:00 2001
+From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
+Date: Fri, 12 Apr 2024 14:44:43 +0200
+Subject: [PATCH] Add missing cstdint include
+
+---
+ src/dependencies/DataTrackingSupport.hpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/dependencies/DataTrackingSupport.hpp b/src/dependencies/DataTrackingSupport.hpp
+index 56226085..cdfd5e1c 100644
+--- a/src/dependencies/DataTrackingSupport.hpp
++++ b/src/dependencies/DataTrackingSupport.hpp
+@@ -1,13 +1,14 @@
+ /*
+ 	This file is part of Nanos6 and is licensed under the terms contained in the COPYING file.
+ 
+-	Copyright (C) 2020 Barcelona Supercomputing Center (BSC)
++	Copyright (C) 2020-2024 Barcelona Supercomputing Center (BSC)
+ */
+ 
+ #ifndef DATA_TRACKING_SUPPORT_HPP
+ #define DATA_TRACKING_SUPPORT_HPP
+ 
+ #include "support/config/ConfigVariable.hpp"
++#include <cstdint>
+ 
+ class Task;
+ 
+-- 
+2.44.0
+
diff --git a/pkgs/nanos6/default.nix b/pkgs/nanos6/default.nix
index 22d9dc5..e1eac9f 100644
--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@@ -35,6 +35,10 @@ let
       rev = "version-${version}";
       hash = "sha256-o2j7xNufdjcWykbwDDHQYxYCs4kpyQvJnuFyeXYZULw=";
     };
+    patches = [
+      # https://pm.bsc.es/gitlab/nanos6/nanos6/-/issues/185
+      ./0001-Add-missing-cstdint-include.patch
+    ];
   };
 
   git = rec {
@@ -48,9 +52,8 @@ let
 
   source = if (useGit) then git else release;
 in
-  stdenv.mkDerivation rec {
+  stdenv.mkDerivation (source // rec {
     pname = "nanos6";
-    inherit (source) src version;
 
     prePatch = ''
       patchShebangs scripts/generate_config.sh
@@ -114,4 +117,4 @@ in
       platforms = platforms.linux;
       license = licenses.gpl3;
     };
-  }
+  })