From 4124eb7bd56f7aefc302032c2696a1acbd8b8344 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 24 Jun 2023 23:08:28 +0200 Subject: [PATCH] compressFirmwareXz: preserve meta attributes Among other things, this preserves the package priority, which is important when building the `hardware.firmware` environment in NixOS. --- pkgs/build-support/kernel/compress-firmware-xz.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix index 6a797226aa67..cfb06a5c0f15 100644 --- a/pkgs/build-support/kernel/compress-firmware-xz.nix +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -1,8 +1,12 @@ -{ runCommand }: +{ runCommand, lib }: firmware: -runCommand "${firmware.name}-xz" {} '' +let + args = lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; }; +in + +runCommand "${firmware.name}-xz" args '' mkdir -p $out/lib (cd ${firmware} && find lib/firmware -type d -print0) | (cd $out && xargs -0 mkdir -v --)