Unverified Commit 8a8dd3e0 authored by r-vdp's avatar r-vdp
Browse files

fwupd: only enable HSI on x86 

Upstream auto-disables the `hsi` meson feature on non-x86 hosts, but
nixpkgs' meson setup hook passes `-Dauto_features=enabled` which
overrides that and force-enables it everywhere. With HSI compiled in,
`fwupdtool security` succeeds on aarch64 while the installed test
script expects it to fail on non-x86, so `fwupdtool.test` has been
broken on Hydra/aarch64-linux since fwupd 2.0.17.

Explicitly mirror upstream's auto behaviour so the installed tests
match their expectations again.
parent 4ccbe12a

pkgs/by-name/fw/fwupd/package.nix

+3 −0
Original line number Diff line number Diff line
@@ -263,6 +263,9 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")

    (lib.mesonOption "efi_os_dir" "nixos")

    (lib.mesonEnable "plugin_modem_manager" true)

    # HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides

    # that, breaking the fwupdtool installed test which expects rc=1 on non-x86.

    (lib.mesonEnable "hsi" isx86)

    (lib.mesonBool "vendor_metadata" true)

    (lib.mesonBool "plugin_uefi_capsule_splash" false)

    # TODO: what should this be?