From 9910fdb668bb4f582c0f576317b4cd3f9176dcf9 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Fri, 8 Dec 2023 18:20:32 +0800 Subject: [PATCH] nixpkgs/fwupd: remove patch --- flake/nixpkgs.nix | 13 +------------ patches/fwupd-lockdown-unknown-as-invalid.patch | 12 ------------ 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 patches/fwupd-lockdown-unknown-as-invalid.patch diff --git a/flake/nixpkgs.nix b/flake/nixpkgs.nix index e52046e9d..4f028a28c 100644 --- a/flake/nixpkgs.nix +++ b/flake/nixpkgs.nix @@ -130,18 +130,7 @@ inherit (config.nixpkgs) config; }; in { - # TODO broken - fwupd = - (prev.fwupd.override { - stdenv = final.ccacheStdenv; - }) - .overrideAttrs (old: { - patches = - (old.patches or []) - ++ [ - ../patches/fwupd-lockdown-unknown-as-invalid.patch - ]; - }); + # currently nothing }; in { nixpkgs = { diff --git a/patches/fwupd-lockdown-unknown-as-invalid.patch b/patches/fwupd-lockdown-unknown-as-invalid.patch deleted file mode 100644 index c889c8b8c..000000000 --- a/patches/fwupd-lockdown-unknown-as-invalid.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/plugins/linux-lockdown/fu-linux-lockdown-plugin.c b/plugins/linux-lockdown/fu-linux-lockdown-plugin.c -index 6c8d3ee94..ea8b85597 100644 ---- a/plugins/linux-lockdown/fu-linux-lockdown-plugin.c -+++ b/plugins/linux-lockdown/fu-linux-lockdown-plugin.c -@@ -155,7 +155,7 @@ fu_linux_lockdown_plugin_add_security_attrs(FuPlugin *plugin, FuSecurityAttrs *a - g_info("failed to ensure attribute fix flags: %s", error_local->message); - - if (self->lockdown == FU_LINUX_LOCKDOWN_UNKNOWN) { -- fwupd_security_attr_add_flag(attr, FWUPD_SECURITY_ATTR_FLAG_MISSING_DATA); -+ fwupd_security_attr_set_result(attr, FWUPD_SECURITY_ATTR_RESULT_NOT_VALID); - return; - }