e2fsprogs: move scripts to separate output (#431959)

This commit is contained in:
Arian van Putten
2025-08-10 19:48:27 +02:00
committed by GitHub
+24
View File
@@ -14,12 +14,16 @@
e2fsprogs,
runCommand,
libarchive,
bash,
bashNonInteractive,
}:
stdenv.mkDerivation rec {
pname = "e2fsprogs";
version = "1.47.3";
__structuredAttrs = true;
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz";
hash = "sha256-hX5u+AD+qiu0V4+8gQIUvl08iLBy6lPFOEczqWVzcyk=";
@@ -42,9 +46,12 @@ stdenv.mkDerivation rec {
"out"
"man"
"info"
"scripts"
]
++ lib.optionals withFuse [ "fuse2fs" ];
strictDeps = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
pkg-config
@@ -54,6 +61,7 @@ stdenv.mkDerivation rec {
libuuid
gettext
libarchive
bash
]
++ lib.optionals withFuse [ fuse3 ];
@@ -86,6 +94,11 @@ stdenv.mkDerivation rec {
if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then
mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
fi
moveToOutput bin/mk_cmds "$scripts"
moveToOutput bin/compile_et "$scripts"
moveToOutput sbin/e2scrub "$scripts"
moveToOutput sbin/e2scrub_all "$scripts"
''
+ lib.optionalString withFuse ''
mkdir -p $fuse2fs/bin
@@ -94,6 +107,17 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
outputChecks = {
bin.disallowedRequisites = [
bash
bashNonInteractive
];
out.disallowedRequisites = [
bash
bashNonInteractive
];
};
passthru.tests = {
simple-filesystem = runCommand "e2fsprogs-create-fs" { } ''
mkdir -p $out