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

Merge pull request #116958 from midchildan/package/macfuse

Browse Source 
macfuse-stubs: replace osxfuse 3.8.3
This commit is contained in:
Bernardo Meurer
2021-03-21 07:28:48 +00:00
committed by GitHub
parent 78a31c1d1d 3a4c9d4b62
commit 1d1089dbf4
9 changed files with 67 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/bindfs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fuse, pkg-config, osxfuse }:
{ lib, stdenv, fetchurl, fuse, pkg-config, macfuse-stubs }:
stdenv.mkDerivation rec {
version = "1.15.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = if stdenv.isDarwin
then [ osxfuse ]
then [ macfuse-stubs ]
else [ fuse ];
postFixup = ''
ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
pkgs/tools/filesystems/s3fs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, osxfuse }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, macfuse-stubs }:
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ curl openssl libxml2 ]
++ lib.optionals stdenv.isLinux [ fuse ]
++ lib.optionals stdenv.isDarwin [ osxfuse ];
++ lib.optionals stdenv.isDarwin [ macfuse-stubs ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [
pkgs/tools/filesystems/unionfs-fuse/default.nix
+3 -5
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, fuse, osxfuse }:
{ lib, stdenv, fetchFromGitHub, cmake, fuse, macfuse-stubs }:
stdenv.mkDerivation rec {
pname = "unionfs-fuse";
@@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace '/usr/local/include/osxfuse/fuse' '${osxfuse}/include/osxfuse/fuse'
substituteInPlace src/CMakeLists.txt \
--replace 'target_link_libraries(unionfs fuse pthread)' 'target_link_libraries(unionfs osxfuse pthread)'
--replace '/usr/local/include/osxfuse/fuse' '${macfuse-stubs}/include/fuse'
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ (if stdenv.isDarwin then osxfuse else fuse) ];
buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ];
# Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
# possible to do: