From aef4614421f4d8142d627bb3dcdbb013549fc573 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Wed, 2 Oct 2024 19:07:09 -0400
Subject: [PATCH] xar: add xarMinimal

xarMinimal allows e2fsprogs to build fuse2fs again on Darwin.
See https://github.com/NixOS/nixpkgs/pull/339412.
---
 pkgs/by-name/xa/xar/package.nix | 2 +-
 pkgs/top-level/all-packages.nix | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix
index 4ad071f36a1f..1331041c98af 100644
--- a/pkgs/by-name/xa/xar/package.nix
+++ b/pkgs/by-name/xa/xar/package.nix
@@ -30,7 +30,7 @@
   xar,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  pname = "xar";
+  pname = "xar${lib.optionalString (e2fsprogs == null) "-minimal"}";
   version = "498";
 
   src = fetchFromGitHub {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c081a7026bef..d607957706aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13874,6 +13874,10 @@ with pkgs;
     zig = buildPackages.zig_0_12;
   };
 
+  # A minimal xar is needed to break an infinite recursion between macfuse-stubs and xar.
+  # It is also needed to reduce the amount of unnecessary stuff in the Darwin bootstrap.
+  xarMinimal = callPackage ../by-name/xa/xar/package.nix { e2fsprogs = null; };
+
   xclip = callPackage ../tools/misc/xclip { };
 
   xcur2png = callPackage ../tools/graphics/xcur2png { };