From 0cad06d22a6159d6692f1495ecddf3846e516a34 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Sun, 17 Nov 2024 09:54:22 -0500
Subject: [PATCH 1/3] xtreemfs: fix build

---
 pkgs/tools/filesystems/xtreemfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 7d43a440ed61..017e86dc7d9b 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -74,8 +74,8 @@ stdenv.mkDerivation {
     substituteInPlace cpp/CMakeLists.txt \
       --replace '"/lib64" "/usr/lib64"' '"${attr.out}/lib" "${lib.getLib fuse}/lib"'
 
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include"
-    export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev fuse}/include"
+    export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${lib.getLib fuse}/lib"
 
     export DESTDIR=$out
 

From b9932292ede742b1bb55d425fc229ad11f3197d6 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Sun, 17 Nov 2024 09:54:58 -0500
Subject: [PATCH 2/3] xtreemfs: format

---
 pkgs/tools/filesystems/xtreemfs/default.nix | 51 +++++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 017e86dc7d9b..146663cc88b8 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -1,20 +1,21 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, fetchpatch
-, makeWrapper
-, stripJavaArchivesHook
-, ant
-, attr
-, boost
-, cmake
-, file
-, fuse
-, jdk8
-, openssl
-, python3
-, valgrind
-, which
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  makeWrapper,
+  stripJavaArchivesHook,
+  ant,
+  attr,
+  boost,
+  cmake,
+  file,
+  fuse,
+  jdk8,
+  openssl,
+  python3,
+  valgrind,
+  which,
 }:
 
 stdenv.mkDerivation {
@@ -29,8 +30,15 @@ stdenv.mkDerivation {
     sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0";
   };
 
-  nativeBuildInputs = [ makeWrapper python3 stripJavaArchivesHook ];
-  buildInputs = [ which attr ];
+  nativeBuildInputs = [
+    makeWrapper
+    python3
+    stripJavaArchivesHook
+  ];
+  buildInputs = [
+    which
+    attr
+  ];
 
   patches = [
     (fetchpatch {
@@ -107,7 +115,10 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Distributed filesystem";
-    maintainers = with lib.maintainers; [ raskin matejc ];
+    maintainers = with lib.maintainers; [
+      raskin
+      matejc
+    ];
     platforms = lib.platforms.linux;
     license = lib.licenses.bsd3;
   };

From 392b7a8718e3549b4e80820cf5a1ec58dc5bc5a7 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Mon, 18 Nov 2024 13:31:21 -0500
Subject: [PATCH 3/3] xtreemfs: move `which` to `nativeBuildInputs`

---
 pkgs/tools/filesystems/xtreemfs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 146663cc88b8..eed43270e18d 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -34,9 +34,9 @@ stdenv.mkDerivation {
     makeWrapper
     python3
     stripJavaArchivesHook
+    which
   ];
   buildInputs = [
-    which
     attr
   ];