pyrox.dev
Merge pull request #242810 from R-VdP/fwupd_1_9_3
fwupd: 1.9.2 -> 1.9.3
authored by Pol Dellaiera and committed by GitHub 4c6b5045 312fda11
+2
-2
pkgs/os-specific/linux/firmware/fwupd/default.nix
+2
-2
pkgs/os-specific/linux/firmware/fwupd/default.nix
···
123
in
124
stdenv.mkDerivation (finalAttrs: {
125
pname = "fwupd";
126
-
version = "1.9.2";
127
128
# libfwupd goes to lib
129
# daemon, plug-ins and libfwupdplugin go to out
···
134
owner = "fwupd";
135
repo = "fwupd";
136
rev = finalAttrs.version;
137
-
hash = "sha256-ESBTT7KO4WZKS5ArXZI0pxQpfFK4h4HbClaITm5bxfU=";
138
};
139
140
patches = [
···
123
in
124
stdenv.mkDerivation (finalAttrs: {
125
pname = "fwupd";
126
+
version = "1.9.3";
127
128
# libfwupd goes to lib
129
# daemon, plug-ins and libfwupdplugin go to out
···
134
owner = "fwupd";
135
repo = "fwupd";
136
rev = finalAttrs.version;
137
+
hash = "sha256-IVP5RVHRxWkvPqndiuCxiguYWN5d32qJo9YzBOHoyUk";
138
};
139
140
patches = [
+6
-6
pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch
+6
-6
pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch
···
1
diff --git a/meson.build b/meson.build
2
-
index 7ac8c937a..5a23d0c80 100644
3
--- a/meson.build
4
+++ b/meson.build
5
-
@@ -419,7 +419,7 @@ if build_standalone and efiboot.found() and efivar.found()
6
-
conf.set('HAVE_EFI_TIME_T', '1')
7
-
endif
8
-
9
- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
10
+ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi')
11
conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
12
-
13
if host_cpu == 'x86'
···
1
diff --git a/meson.build b/meson.build
2
+
index b18108c74..7e674b4d2 100644
3
--- a/meson.build
4
+++ b/meson.build
5
+
@@ -404,7 +404,7 @@ endif
6
+
7
+
# EFI
8
+
if build_standalone
9
- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
10
+ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi')
11
conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
12
if host_cpu == 'x86'
13
+
EFI_MACHINE_TYPE_NAME = 'ia32'