diff --git a/pkgs/by-name/af/afflib/package.nix b/pkgs/by-name/af/afflib/package.nix index b8076df609dd..58944ead3050 100644 --- a/pkgs/by-name/af/afflib/package.nix +++ b/pkgs/by-name/af/afflib/package.nix @@ -5,7 +5,6 @@ zlib, curl, expat, - fuse, fuse3, openssl, autoreconfHook, @@ -30,9 +29,10 @@ stdenv.mkDerivation (finalAttrs: { expat openssl python3 - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ fuse ]; + fuse3 + ]; + + env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-DFUSE_DARWIN_ENABLE_EXTENSIONS=0"; meta = { homepage = "http://afflib.sourceforge.net/"; diff --git a/pkgs/by-name/ss/sshfs-fuse/common.nix b/pkgs/by-name/ss/sshfs-fuse/common.nix index b5b1e5028de3..ca4b1b111897 100644 --- a/pkgs/by-name/ss/sshfs-fuse/common.nix +++ b/pkgs/by-name/ss/sshfs-fuse/common.nix @@ -15,6 +15,7 @@ docutils, makeWrapper, fuse3, + macfuse-stubs, glib, which, python3Packages, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6e71b9b9d0c..b0fd3fe3bb4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8616,7 +8616,12 @@ with pkgs; ); fuse = fuse2; fuse2 = lowPrio (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fusePackages.fuse_2); - fuse3 = lowPrio (if stdenv.hostPlatform.isDarwin then macfuse-stubs.override { isFuse3 = true; } else fusePackages.fuse_3); + fuse3 = lowPrio ( + if stdenv.hostPlatform.isDarwin then + macfuse-stubs.override { isFuse3 = true; } + else + fusePackages.fuse_3 + ); gpm-ncurses = gpm.override { withNcurses = true; };