Skip to content

Commit

Permalink
Revert "e2fsprogs: build fuse2fs on darwin"
Browse files Browse the repository at this point in the history
This change, while fine in isolation, breaks evaluation in combination
with <#329721>, as `xar` depends
on `e2fsprogs` which now depends on `macfuse-stubs` which depends on
`xar`. This broke `staging-next`.

A couple possible solutions are to disable the `e2fsprogs` dependency
in the version of `xar` used for the bootstrap, or to build
`macfuse-stubs` from source to avoid the `xar` dependency.

This reverts commit 0dfc820.
  • Loading branch information
emilazy committed Sep 4, 2024
1 parent 23b4832 commit 8f61973
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 24 deletions.
8 changes: 4 additions & 4 deletions pkgs/tools/filesystems/e2fsprogs/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo
, withFuse ? stdenv.isLinux || stdenv.isDarwin, fuse3, macfuse-stubs
, withFuse ? stdenv.isLinux, fuse3
, shared ? !stdenv.hostPlatform.isStatic
, e2fsprogs, runCommand
}:
Expand All @@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config texinfo ];
buildInputs = [ libuuid gettext ]
++ lib.optional withFuse (if stdenv.isDarwin then macfuse-stubs else fuse3);
++ lib.optionals withFuse [ fuse3 ];

patches = [
# Avoid trouble with older systems like NixOS 23.05.
Expand All @@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
url = "https://lore.kernel.org/linux-ext4/[email protected]/raw";
hash = "sha256-pMoqm2eo5zYaTdU+Ppa4+posCVFb2A9S4uo5oApaaqc=";
})
] ++ lib.optional stdenv.isDarwin ./macfuse.patch;
];

configureFlags =
if stdenv.isLinux then [
Expand All @@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
"--disable-uuidd"
] else [
"--enable-libuuid --disable-e2initrd-helper"
] ++ lib.optional stdenv.isDarwin "CFLAGS=-D_FILE_OFFSET_BITS=64";
];

nativeCheckInputs = [ buildPackages.perl ];
doCheck = true;
Expand Down
20 changes: 0 additions & 20 deletions pkgs/tools/filesystems/e2fsprogs/macfuse.patch

This file was deleted.

0 comments on commit 8f61973

Please sign in to comment.