Merge pull request #163882 from Artturin/e2fsprogsfuse2fsoutput
This commit is contained in:
commit
a3f0659317
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo
|
||||
, fuse
|
||||
, shared ? !stdenv.hostPlatform.isStatic
|
||||
, e2fsprogs, runCommand
|
||||
}:
|
||||
|
@ -12,11 +13,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1fgvwbj9ihz5svzrd2l0s18k16r4qg3wimrniv71fn3vdcg0shxp";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "info" ];
|
||||
# fuse2fs adds 14mb of dependencies
|
||||
outputs = [ "bin" "dev" "out" "man" "info" ]
|
||||
++ lib.optionals stdenv.isLinux [ "fuse2fs" ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ pkg-config texinfo ];
|
||||
buildInputs = [ libuuid gettext ];
|
||||
buildInputs = [ libuuid gettext ]
|
||||
++ lib.optionals stdenv.isLinux [ fuse ];
|
||||
|
||||
# Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc
|
||||
patches = if stdenv.hostPlatform.libc == "glibc" then null
|
||||
|
@ -62,6 +66,9 @@ stdenv.mkDerivation rec {
|
|||
if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then
|
||||
mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
|
||||
fi
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p $fuse2fs/bin
|
||||
mv $bin/bin/fuse2fs $fuse2fs/bin/fuse2fs
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -371,6 +371,7 @@ mapAliases ({
|
|||
fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15
|
||||
fuse_exfat = throw "'fuse_exfat' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22
|
||||
fuseki = throw "'fuseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22
|
||||
fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
|
||||
fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19
|
||||
|
||||
### G ###
|
||||
|
|
Loading…
Reference in a new issue