pyrox.dev
fwupd: 1.0.1 → 1.0.4
+10
-16
pkgs/os-specific/linux/firmware/fwupd/default.nix
+10
-16
pkgs/os-specific/linux/firmware/fwupd/default.nix
···
2
2
, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking
3
3
, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar, glibcLocales
4
4
, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3, colord
5
-
, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook
5
+
, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook, json_glib
6
6
}:
7
7
let
8
-
version = "1.0.2";
8
+
version = "1.0.4";
9
9
in stdenv.mkDerivation {
10
10
name = "fwupd-${version}";
11
11
src = fetchurl {
12
12
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
13
-
sha256 = "15hrl6jq2kyvbxgjkv3qafqj2962il27gryakm39kvz2p2l1bacj";
13
+
sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3";
14
14
};
15
15
16
16
nativeBuildInputs = [
···
19
19
];
20
20
buildInputs = [
21
21
polkit appstream-glib gusb sqlite libarchive libsoup libelf libsmbios fwupdate libyaml
22
-
libgudev colord gpgme libuuid pillow gnutls glib_networking
22
+
libgudev colord gpgme libuuid pillow gnutls glib_networking efivar json_glib
23
23
];
24
24
25
25
LC_ALL = "en_US.UTF-8"; # For po/make-images
26
26
27
-
NIX_CFLAGS_COMPILE = [
28
-
"-I${efivar}/include/efivar"
29
-
# warning: "__LIBELF_INTERNAL__" is not defined
30
-
"-Wno-error=undef"
31
-
];
32
-
33
27
patches = [
34
28
./fix-missing-deps.patch
35
29
];
···
38
32
'';
39
33
40
34
mesonFlags = [
41
-
"-Denable-man=false"
42
-
"-Denable-tests=false"
43
-
"-Denable-doc=false"
44
-
"-Dwith-bootdir=/boot"
45
-
"-Dwith-udevdir=lib/udev"
46
-
"-Dwith-systemdunitdir=lib/systemd/system"
35
+
"-Dman=false"
36
+
"-Dtests=false"
37
+
"-Dgtkdoc=false"
38
+
"-Dbootdir=/boot"
39
+
"-Dudevdir=lib/udev"
40
+
"-Dsystemdunitdir=lib/systemd/system"
47
41
"--localstatedir=/var"
48
42
];
49
43
+11
-11
pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
+11
-11
pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
···
2
2
+++ b/data/builder/meson.build
3
3
@@ -1,3 +0,0 @@
4
4
-install_data('README.md',
5
-
- install_dir : join_paths(get_option('localstatedir'), 'lib', 'fwupd', 'builder')
5
+
- install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder')
6
6
-)
7
7
--- a/data/meson.build
8
8
+++ b/data/meson.build
···
11
11
endif
12
12
13
13
-install_data(['daemon.conf'],
14
-
- install_dir : join_paths(get_option('sysconfdir'), 'fwupd')
14
+
- install_dir : join_paths(sysconfdir, 'fwupd')
15
15
-)
16
16
-
17
17
install_data(['org.freedesktop.fwupd.metainfo.xml'],
18
-
install_dir: join_paths(get_option('datadir'), 'metainfo')
18
+
install_dir: join_paths(datadir, 'metainfo')
19
19
)
20
20
21
21
install_data(['org.freedesktop.fwupd.conf'],
22
-
- install_dir : join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d')
22
+
- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
23
23
+ install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d')
24
24
)
25
25
···
30
30
'GPG-KEY-Hughski-Limited',
31
31
'GPG-KEY-Linux-Vendor-Firmware-Service',
32
32
],
33
-
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd')
33
+
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
34
34
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
35
35
)
36
36
37
37
install_data([
38
38
'GPG-KEY-Linux-Vendor-Firmware-Service',
39
39
],
40
-
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata')
40
+
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
41
41
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
42
42
)
43
43
endif
···
46
46
install_data([
47
47
'LVFS-CA.pem',
48
48
],
49
-
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd')
49
+
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
50
50
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
51
51
)
52
52
install_data([
53
53
'LVFS-CA.pem',
54
54
],
55
-
- install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata')
55
+
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
56
56
+ install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
57
57
)
58
58
endif
···
63
63
'lvfs.conf',
64
64
'lvfs-testing.conf',
65
65
],
66
-
- install_dir : join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d')
66
+
- install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
67
67
+ install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d')
68
68
)
69
69
endif
···
72
72
output : 'fwupd.conf',
73
73
configuration : con2,
74
74
install: true,
75
-
- install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'),
75
+
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
76
76
+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
77
77
)
78
78
configure_file(
···
80
80
output : 'vendor.conf',
81
81
configuration : con2,
82
82
install: true,
83
-
- install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'),
83
+
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
84
84
+ install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
85
85
)
86
86
--- a/meson_post_install.sh