tjh.dev
make-iso9660-image: use `__structuredAttrs`
Makes it easier to enable discarding of references, a feature of Nix
2.14 which requires structured attrs.
+3
-3
nixos/lib/make-iso9660-image.nix
+3
-3
nixos/lib/make-iso9660-image.nix
···
47
48
stdenv.mkDerivation {
49
name = isoName;
50
-
builder = ./make-iso9660-image.sh;
51
nativeBuildInputs = [ xorriso syslinux zstd libossp_uuid ];
52
53
inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable;
54
55
-
# !!! should use XML.
56
sources = map (x: x.source) contents;
57
targets = map (x: x.target) contents;
58
59
-
# !!! should use XML.
60
objects = map (x: x.object) storeContents;
61
symlinks = map (x: x.symlink) storeContents;
62
···
47
48
stdenv.mkDerivation {
49
name = isoName;
50
+
__structuredAttrs = true;
51
+
52
+
buildCommandPath = ./make-iso9660-image.sh;
53
nativeBuildInputs = [ xorriso syslinux zstd libossp_uuid ];
54
55
inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable;
56
57
sources = map (x: x.source) contents;
58
targets = map (x: x.target) contents;
59
60
objects = map (x: x.object) storeContents;
61
symlinks = map (x: x.symlink) storeContents;
62
+8
-17
nixos/lib/make-iso9660-image.sh
+8
-17
nixos/lib/make-iso9660-image.sh
···
1
-
source $stdenv/setup
2
-
3
-
sources_=($sources)
4
-
targets_=($targets)
5
-
6
-
objects=($objects)
7
-
symlinks=($symlinks)
8
-
9
-
10
# Remove the initial slash from a path, since genisofs likes it that way.
11
stripSlash() {
12
res="$1"
···
35
# The -boot-info-table option modifies the $bootImage file, so
36
# find it in `contents' and make a copy of it (since the original
37
# is read-only in the Nix store...).
38
-
for ((i = 0; i < ${#targets_[@]}; i++)); do
39
-
stripSlash "${targets_[$i]}"
40
if test "$res" = "$bootImage"; then
41
-
echo "copying the boot image ${sources_[$i]}"
42
-
cp "${sources_[$i]}" boot.img
43
chmod u+w boot.img
44
-
sources_[$i]=boot.img
45
fi
46
done
47
···
66
67
68
# Add the individual files.
69
-
for ((i = 0; i < ${#targets_[@]}; i++)); do
70
-
stripSlash "${targets_[$i]}"
71
-
addPath "$res" "${sources_[$i]}"
72
done
73
74
···
1
# Remove the initial slash from a path, since genisofs likes it that way.
2
stripSlash() {
3
res="$1"
···
26
# The -boot-info-table option modifies the $bootImage file, so
27
# find it in `contents' and make a copy of it (since the original
28
# is read-only in the Nix store...).
29
+
for ((i = 0; i < ${#targets[@]}; i++)); do
30
+
stripSlash "${targets[$i]}"
31
if test "$res" = "$bootImage"; then
32
+
echo "copying the boot image ${sources[$i]}"
33
+
cp "${sources[$i]}" boot.img
34
chmod u+w boot.img
35
+
sources[$i]=boot.img
36
fi
37
done
38
···
57
58
59
# Add the individual files.
60
+
for ((i = 0; i < ${#targets[@]}; i++)); do
61
+
stripSlash "${targets[$i]}"
62
+
addPath "$res" "${sources[$i]}"
63
done
64
65