BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #189056 from jtojnar/fwupd

Browse source
This commit is contained in:
Sandro 2022-09-05 16:13:00 +02:00 committed by GitHub
commit 2902676b30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/hardware/fwupd.nix
View file

@ -126,6 +126,8 @@ in {
services.udev.packages = [ cfg.package ]; services.udev.packages = [ cfg.package ];
systemd.packages = [ cfg.package ]; systemd.packages = [ cfg.package ];
security.polkit.enable = true;
}; };
meta = { meta = {

19
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
View file

@ -1,5 +1,16 @@
diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
index b0ff5b106..13ac380d0 100644
--- a/data/bios-settings.d/meson.build
+++ b/data/bios-settings.d/meson.build
@@ -1,5 +1,5 @@
if build_standalone and host_machine.system() == 'linux'
install_data('README.md',
- install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d')
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'bios-settings.d')
)
endif
diff --git a/data/meson.build b/data/meson.build diff --git a/data/meson.build b/data/meson.build
index d8494020d..7c896fa0d 100644 index 3a77a7bfc..747bd1988 100644
--- a/data/meson.build --- a/data/meson.build
+++ b/data/meson.build +++ b/data/meson.build
@@ -26,7 +26,7 @@ endif @@ -26,7 +26,7 @@ endif
@ -83,7 +94,7 @@ index 1d1698a7e..5469d00a6 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
) )
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index e6b717078..f8a7a7455 100644 index e7980e965..2c66e2dc4 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -195,6 +195,12 @@ endif @@ -195,6 +195,12 @@ endif
@ -100,7 +111,7 @@ index e6b717078..f8a7a7455 100644
gio = dependency('gio-2.0', version: '>= 2.45.8') gio = dependency('gio-2.0', version: '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false) giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt diff --git a/meson_options.txt b/meson_options.txt
index 06d242371..d9e517fc0 100644 index 6cf92e72e..2e8568292 100644
--- a/meson_options.txt --- a/meson_options.txt
+++ b/meson_options.txt +++ b/meson_options.txt
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
@ -121,7 +132,7 @@ index 67bd3b9d9..ad04a91b6 100644
) )
endif endif
diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
index 13f03ccd4..9235ebe33 100644 index d626c3ad3..5a2f847d5 100644
--- a/plugins/msr/meson.build --- a/plugins/msr/meson.build
+++ b/plugins/msr/meson.build +++ b/plugins/msr/meson.build
@@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'], @@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'],

5
pkgs/os-specific/linux/firmware/fwupd/default.nix
View file

@ -114,7 +114,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "fwupd"; pname = "fwupd";
version = "1.8.3"; version = "1.8.4";
# libfwupd goes to lib # libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out # daemon, plug-ins and libfwupdplugin go to out
@ -123,7 +123,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "sha256-ciIpd86KhmJRH/o8CIFWb2xFjsjWHSUNlGYRfWEiOOw="; sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY=";
}; };
patches = [ patches = [
@ -322,6 +322,7 @@ let
passthru = { passthru = {
filesInstalledToEtc = [ filesInstalledToEtc = [
"fwupd/bios-settings.d/README.md"
"fwupd/daemon.conf" "fwupd/daemon.conf"
"fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/lvfs.conf"