alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #163882 from Artturin/e2fsprogsfuse2fsoutput

Browse source
This commit is contained in:
Artturi 2022-03-27 17:27:46 +03:00 committed by GitHub
parent b5faefa04a b7dcb6e2c7
commit a3f0659317
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/filesystems/e2fsprogs/default.nix
View file

@ -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;

1
pkgs/top-level/aliases.nix
View file

@ -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 ###