diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-12-03 19:59:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-03 20:59:15 +0200 |
| commit | f0faf7cf3f72251a5d9ebbd034ccc34eb519704e (patch) | |
| tree | a6f7e2fa955bbfbca1bc1d3e0d7eb9e3f627be20 /pkgs/os-specific/linux/firmware | |
| parent | fdf8fc7c001b29e5cd53718907ce229f36dadeb4 (diff) | |
| download | nixpkgs-f0faf7cf3f72251a5d9ebbd034ccc34eb519704e.tar nixpkgs-f0faf7cf3f72251a5d9ebbd034ccc34eb519704e.tar.gz nixpkgs-f0faf7cf3f72251a5d9ebbd034ccc34eb519704e.tar.bz2 nixpkgs-f0faf7cf3f72251a5d9ebbd034ccc34eb519704e.tar.lz nixpkgs-f0faf7cf3f72251a5d9ebbd034ccc34eb519704e.tar.xz nixpkgs-f0faf7cf3f72251a5d9ebbd034ccc34eb519704e.tar.zst nixpkgs-f0faf7cf3f72251a5d9ebbd034ccc34eb519704e.zip | |
fwupd: 1.7.1 → 1.7.2 (#147032)
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index e6c43c0aa6e..71f6da0d13b 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -112,7 +112,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.7.1"; + version = "1.7.2"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -121,7 +121,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-rlbOtEt4byH1TRM6xwvF2cuM1L2gFnM5xmmiKNpn+jw="; + sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ="; }; patches = [ @@ -142,6 +142,9 @@ let # Tests detect fwupd is installed when prefix is /usr. ./fix-install-detection.patch + + # EFI capsule is located in fwupd-efi now. + ./efi-app-path.patch ]; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch new file mode 100644 index 00000000000..c2502502a40 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 4330512e..e53b70ab 100644 +--- a/meson.build ++++ b/meson.build +@@ -403,7 +403,7 @@ endif + if build_standalone and get_option('plugin_uefi_capsule') + efiboot = dependency('efiboot') + +- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') ++ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') + conf.set_quoted('EFI_APP_LOCATION', efi_app_location) + + if host_cpu == 'x86' |