nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 08:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fwupd: 2.1.5 -> 2.1.6; remove efi patch

Browse Source
This commit is contained in:
kashw2
2026-07-09 18:09:12 +10:00
parent d65b116ca7
commit e3469ceba1
2 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
View File

@@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Mon, 28 Oct 2024 12:08:49 +0100
Subject: [PATCH] Get the efi app from fwupd-efi
EFI capsule is located in fwupd-efi now.
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 917770b38abb86056d6c42fa9c99dedf27ebe999..f52f3ec12dd9def0a68ea1645f7d508acbb731b9 100644
--- a/meson.build
+++ b/meson.build
@@ -651,7 +651,7 @@ endif
# EFI
if build_standalone
- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
+ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi')
conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
endif

7
pkgs/by-name/fw/fwupd/package.nix
View File

@@ -122,7 +122,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "2.1.5";
version = "2.1.6";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -140,14 +140,13 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
tag = finalAttrs.version;
hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc=";
hash = "sha256-K8n1rPiLuHDybWPoAUQA7RY4J+Ga1fwNiaj48fHAh9A=";
};
patches = [
./0001-Install-fwupdplugin-to-out.patch
./0002-Add-output-for-installed-tests.patch
./0003-Add-option-for-installation-sysconfdir.patch
./0004-Get-the-efi-app-from-fwupd-efi.patch
];
postPatch = ''
@@ -227,6 +226,8 @@ stdenv.mkDerivation (finalAttrs: {
"--sysconfdir=/etc"
(lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
(lib.mesonOption "efi_os_dir" "nixos")
# EFI capsule is located in fwupd-efi now.
(lib.mesonOption "efi_app_location" "${fwupd-efi}/libexec/fwupd/efi")
# 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)