pyrox.dev
e2fsprogs: move scripts to separate output (#431959)
authored by Arian van Putten and committed by GitHub e923af99 7f352f80
+24
pkgs/by-name/e2/e2fsprogs/package.nix
+24
pkgs/by-name/e2/e2fsprogs/package.nix
···
14
14
e2fsprogs,
15
15
runCommand,
16
16
libarchive,
17
+
bash,
18
+
bashNonInteractive,
17
19
}:
18
20
19
21
stdenv.mkDerivation rec {
20
22
pname = "e2fsprogs";
21
23
version = "1.47.3";
24
+
25
+
__structuredAttrs = true;
22
26
23
27
src = fetchurl {
24
28
url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz";
···
42
46
"out"
43
47
"man"
44
48
"info"
49
+
"scripts"
45
50
]
46
51
++ lib.optionals withFuse [ "fuse2fs" ];
47
52
53
+
strictDeps = true;
54
+
48
55
depsBuildBuild = [ buildPackages.stdenv.cc ];
49
56
nativeBuildInputs = [
50
57
pkg-config
···
54
61
libuuid
55
62
gettext
56
63
libarchive
64
+
bash
57
65
]
58
66
++ lib.optionals withFuse [ fuse3 ];
59
67
···
86
94
if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then
87
95
mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
88
96
fi
97
+
98
+
moveToOutput bin/mk_cmds "$scripts"
99
+
moveToOutput bin/compile_et "$scripts"
100
+
moveToOutput sbin/e2scrub "$scripts"
101
+
moveToOutput sbin/e2scrub_all "$scripts"
89
102
''
90
103
+ lib.optionalString withFuse ''
91
104
mkdir -p $fuse2fs/bin
···
93
106
'';
94
107
95
108
enableParallelBuilding = true;
109
+
110
+
outputChecks = {
111
+
bin.disallowedRequisites = [
112
+
bash
113
+
bashNonInteractive
114
+
];
115
+
out.disallowedRequisites = [
116
+
bash
117
+
bashNonInteractive
118
+
];
119
+
};
96
120
97
121
passthru.tests = {
98
122
simple-filesystem = runCommand "e2fsprogs-create-fs" { } ''