pyrox.dev / nixpkgs
lol
fork atom

fuse-ext2: init at unstable-2020-07-12

Emily Trau 277ea6ca c4ffc839

+114
unified split
+31
pkgs/tools/filesystems/fuse-ext2/darwin-no-installer.patch
···
··· 1 + diff --git a/fuse-ext2/Makefile.am b/fuse-ext2/Makefile.am 2 + index 9d3a065..c73f337 100644 3 + --- a/fuse-ext2/Makefile.am 4 + +++ b/fuse-ext2/Makefile.am 5 + @@ -113,7 +113,7 @@ fuse_ext2_CFLAGS = \ 6 + -DHAVE_CONFIG_H \ 7 + -I/usr/local/include 8 + 9 + -if DARWIN 10 + +if FALSE 11 + bin_PROGRAMS += \ 12 + fuse-ext2.wait \ 13 + fuse-ext2.install \ 14 + @@ -151,9 +151,6 @@ endif 15 + if DARWIN 16 + install-exec-local: 17 + $(INSTALL) -d "$(DESTDIR)/$(sbindir)" 18 + - $(LN_S) -f "/Library/Filesystems/fuse-ext2.fs/Contents/Resources/mount_fuse-ext2" "$(DESTDIR)/$(sbindir)/mount_fuse-ext2" 19 + - $(LN_S) -f "/usr/local/opt/e2fsprogs/sbin/e2label" "$(DESTDIR)/$(sbindir)/e2label" 20 + - $(LN_S) -f "/usr/local/opt/e2fsprogs/sbin/mke2fs" "$(DESTDIR)/$(sbindir)/mke2fs" 21 + endif 22 + if LINUX 23 + install-data-hook: 24 + diff --git a/tools/Makefile.am b/tools/Makefile.am 25 + index 52f81e1..78c418f 100644 26 + --- a/tools/Makefile.am 27 + +++ b/tools/Makefile.am 28 + @@ -1,2 +1,2 @@ 29 + 30 + -SUBDIRS = macosx 31 + +SUBDIRS =
+46
pkgs/tools/filesystems/fuse-ext2/default.nix
···
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , autoreconfHook 5 + , e2fsprogs 6 + , fuse 7 + }: 8 + 9 + stdenv.mkDerivation (finalAttrs: { 10 + pname = "fuse-ext2"; 11 + version = "unstable-2020-07-12"; 12 + 13 + src = fetchFromGitHub { 14 + owner = "alperakcan"; 15 + repo = "fuse-ext2"; 16 + rev = "899f17c982dadcea13aa447c3a83c53b9431435a"; 17 + sha256 = "AE7Z+HePAy/h2TCNI9tsz6GVLdnE2AIOM3GnQzerKn8="; 18 + }; 19 + 20 + patches = [ 21 + # Remove references to paths outside the nix store 22 + ./remove-impure-paths.patch 23 + # Don't build macOS desktop installer 24 + ./darwin-no-installer.patch 25 + ]; 26 + 27 + nativeBuildInputs = [ 28 + autoreconfHook 29 + ]; 30 + 31 + buildInputs = [ 32 + e2fsprogs 33 + fuse 34 + ]; 35 + 36 + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; 37 + 38 + meta = with lib; { 39 + description = "FUSE module to mount ext2, ext3 and ext4 with read write support"; 40 + homepage = "https://github.com/alperakcan/fuse-ext2"; 41 + license = licenses.gpl2Plus; 42 + maintainers = with maintainers; [ emilytrau ]; 43 + platforms = platforms.unix; 44 + mainProgram = "fuse-ext2"; 45 + }; 46 + })
+35
pkgs/tools/filesystems/fuse-ext2/remove-impure-paths.patch
···
··· 1 + diff --git a/fuse-ext2/Makefile.am b/fuse-ext2/Makefile.am 2 + index 9d3a065..0bb4341 100644 3 + --- a/fuse-ext2/Makefile.am 4 + +++ b/fuse-ext2/Makefile.am 5 + @@ -17,8 +17,7 @@ fuse_ext2_probe_SOURCES = \ 6 + 7 + fuse_ext2_probe_CFLAGS = \ 8 + -Wall \ 9 + - -DHAVE_CONFIG_H \ 10 + - -I/usr/local/include 11 + + -DHAVE_CONFIG_H 12 + 13 + fuse_ext2_SOURCES = \ 14 + fuse-ext2.h \ 15 + @@ -98,9 +97,7 @@ umfuseext2_la_CFLAGS = \ 16 + -Wall \ 17 + -DHAVE_CONFIG_H \ 18 + -D_GNU_SOURCE \ 19 + - $(DEVELFLAGS) \ 20 + - -I$(includedir)/umview \ 21 + - -I/usr/local/include 22 + + $(DEVELFLAGS) 23 + 24 + umfuseext2_la_LDFLAGS = \ 25 + -module \ 26 + @@ -110,8 +107,7 @@ umfuseext2_la_LDFLAGS = \ 27 + 28 + fuse_ext2_CFLAGS = \ 29 + -Wall \ 30 + - -DHAVE_CONFIG_H \ 31 + - -I/usr/local/include 32 + + -DHAVE_CONFIG_H 33 + 34 + if DARWIN 35 + bin_PROGRAMS += \
+2
pkgs/top-level/all-packages.nix
··· 8410 8411 fuse-archive = callPackage ../tools/filesystems/fuse-archive { }; 8412 8413 fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs { }; 8414 8415 fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { };
··· 8410 8411 fuse-archive = callPackage ../tools/filesystems/fuse-archive { }; 8412 8413 + fuse-ext2 = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/fuse-ext2 { }; 8414 + 8415 fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs { }; 8416 8417 fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { };