afflib: build with fuse3 on Darwin
Use a common version of FUSE now that macfuse-stubs supports fuse3 (and the alias is defined for Darwin).
This commit is contained in:
@@ -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/";
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
docutils,
|
||||
makeWrapper,
|
||||
fuse3,
|
||||
macfuse-stubs,
|
||||
glib,
|
||||
which,
|
||||
python3Packages,
|
||||
|
||||
@@ -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; };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user