Merge pull request #270462 from sikmir/e2fsprogs

e2fsprogs: add withFuse option

authored by Nikolay Korotkiy and committed by GitHub 786100e1 2344fe1d

+4 -4
+4 -4
pkgs/tools/filesystems/e2fsprogs/default.nix
··· 1 { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo 2 - , fuse 3 , shared ? !stdenv.hostPlatform.isStatic 4 , e2fsprogs, runCommand 5 }: ··· 15 16 # fuse2fs adds 14mb of dependencies 17 outputs = [ "bin" "dev" "out" "man" "info" ] 18 - ++ lib.optionals stdenv.isLinux [ "fuse2fs" ]; 19 20 depsBuildBuild = [ buildPackages.stdenv.cc ]; 21 nativeBuildInputs = [ pkg-config texinfo ]; 22 buildInputs = [ libuuid gettext ] 23 - ++ lib.optionals stdenv.isLinux [ fuse ]; 24 25 patches = [ 26 (fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y) ··· 63 if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then 64 mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/ 65 fi 66 - '' + lib.optionalString stdenv.isLinux '' 67 mkdir -p $fuse2fs/bin 68 mv $bin/bin/fuse2fs $fuse2fs/bin/fuse2fs 69 '';
··· 1 { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo 2 + , withFuse ? stdenv.isLinux, fuse 3 , shared ? !stdenv.hostPlatform.isStatic 4 , e2fsprogs, runCommand 5 }: ··· 15 16 # fuse2fs adds 14mb of dependencies 17 outputs = [ "bin" "dev" "out" "man" "info" ] 18 + ++ lib.optionals withFuse [ "fuse2fs" ]; 19 20 depsBuildBuild = [ buildPackages.stdenv.cc ]; 21 nativeBuildInputs = [ pkg-config texinfo ]; 22 buildInputs = [ libuuid gettext ] 23 + ++ lib.optionals withFuse [ fuse ]; 24 25 patches = [ 26 (fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y) ··· 63 if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then 64 mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/ 65 fi 66 + '' + lib.optionalString withFuse '' 67 mkdir -p $fuse2fs/bin 68 mv $bin/bin/fuse2fs $fuse2fs/bin/fuse2fs 69 '';