dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #242810 from R-VdP/fwupd_1_9_3

Browse Source 
fwupd: 1.9.2 -> 1.9.3
This commit is contained in:
Pol Dellaiera 2023-07-11 23:33:55 +02:00 committed by GitHub
commit 4c6b50451d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -123,7 +123,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "1.9.2";
version = "1.9.3";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
hash = "sha256-ESBTT7KO4WZKS5ArXZI0pxQpfFK4h4HbClaITm5bxfU=";
hash = "sha256-IVP5RVHRxWkvPqndiuCxiguYWN5d32qJo9YzBOHoyUk";
};
patches = [

12
pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch
View File

@ -1,13 +1,13 @@
diff --git a/meson.build b/meson.build
index 7ac8c937a..5a23d0c80 100644
index b18108c74..7e674b4d2 100644
--- a/meson.build
+++ b/meson.build
@@ -419,7 +419,7 @@ if build_standalone and efiboot.found() and efivar.found()
conf.set('HAVE_EFI_TIME_T', '1')
endif
@@ -404,7 +404,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)
if host_cpu == 'x86'
EFI_MACHINE_TYPE_NAME = 'ia32'