Merge pull request NixOS#284487 from alyssais/compressFirmwareXz

compressFirmwareXz: fix symlink type check
OPNA2608 · Jan 28, 2024 · 50071d8 · 50071d8
2 parents 22635a7 + 59fca7c
commit 50071d8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix
@@ -3,7 +3,9 @@
 firmware:
 
 let
-  args = lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };
+  args = {
+    allowedRequisites = [];
+  } // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };
 in
 
 runCommand "${firmware.name}-xz" args ''
@@ -15,10 +17,13 @@ runCommand "${firmware.name}-xz" args ''
           sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --)
   (cd ${firmware} && find lib/firmware -type l) | while read link; do
       target="$(readlink "${firmware}/$link")"
-      if [ -f $target ]; then
+      if [ -f "${firmware}/$link" ]; then
         ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz"
       else
         ln -vs -- "''${target/^${firmware}/$out}" "$out/$link"
       fi
   done
+
+  echo "Checking for broken symlinks:"
+  find -L $out -type l -print -execdir false -- '{}' '+'
 ''