public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuse: use macfuse-stubs instead on Darwin

Browse Source
This commit is contained in:
midchildan
2021-03-23 23:42:16 +09:00
parent 55b7888f43
commit c595604bed
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/bindfs/default.nix
+2 -4
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fuse, pkg-config, macfuse-stubs }:
{ lib, stdenv, fetchurl, fuse, pkg-config }:
stdenv.mkDerivation rec {
version = "1.15.1";
@@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = if stdenv.isDarwin
then [ macfuse-stubs ]
else [ fuse ];
buildInputs = [ fuse ];
postFixup = ''
ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
'';
pkgs/tools/filesystems/s3fs/default.nix
+2 -4
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, macfuse-stubs }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse }:
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k=";
};
buildInputs = [ curl openssl libxml2 ]
++ lib.optionals stdenv.isLinux [ fuse ]
++ lib.optionals stdenv.isDarwin [ macfuse-stubs ];
buildInputs = [ curl openssl libxml2 fuse ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [
pkgs/tools/filesystems/unionfs-fuse/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, fuse, macfuse-stubs }:
{ lib, stdenv, fetchFromGitHub, cmake, fuse }:
stdenv.mkDerivation rec {
pname = "unionfs-fuse";
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace '/usr/local/include/osxfuse/fuse' '${macfuse-stubs}/include/fuse'
--replace '/usr/local/include/osxfuse/fuse' '${fuse}/include/fuse'
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ];
buildInputs = [ fuse ];
# Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
# possible to do: