xar: add xarMinimal

xarMinimal allows e2fsprogs to build fuse2fs again on Darwin. See NixOS#339412.
reckenrode · Oct 8, 2024 · 63902b1 · 63902b1
1 parent 395300a
commit 63902b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -13891,6 +13891,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 { };