@@ -1,18 +1,67 @@
1−{ stdenv, fetchurl, substituteAll, gtk-doc, pkgconfig, gobject-introspection, intltool
2−, libgudev, polkit, libxmlb, gusb, sqlite, libarchive, glib-networking
3−, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, gnu-efi
4−, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
5−, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion
6−, shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf
7−, cairo, freetype, fontconfig, pango
8−, bubblewrap, efibootmgr, flashrom, tpm2-tools
9−}:
10−
111# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
122
3+{ stdenv
4+, fetchurl
5+, substituteAll
6+, gtk-doc
7+, pkgconfig
8+, gobject-introspection
9+, intltool
10+, libgudev
11+, polkit
12+, libxmlb
13+, gusb
14+, sqlite
15+, libarchive
16+, glib-networking
17+, libsoup
18+, help2man
19+, gpgme
20+, libxslt
21+, elfutils
22+, libsmbios
23+, efivar
24+, gnu-efi
25+, libyaml
26+, valgrind
27+, meson
28+, libuuid
29+, colord
30+, docbook_xml_dtd_43
31+, docbook_xsl
32+, ninja
33+, gcab
34+, gnutls
35+, python3
36+, wrapGAppsHook
37+, json-glib
38+, bash-completion
39+, shared-mime-info
40+, umockdev
41+, vala
42+, makeFontsConf
43+, freefont_ttf
44+, cairo
45+, freetype
46+, fontconfig
47+, pango
48+, bubblewrap
49+, efibootmgr
50+, flashrom
51+, tpm2-tools
52+}:
53+
1354let
14− python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
15− installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
55+ python = python3.withPackages (p: with p; [
56+ pygobject3
57+ pycairo
58+ pillow
59+ ]);
60+
61+ installedTestsPython = python3.withPackages (p: with p; [
62+ pygobject3
63+ requests
64+ ]);
1665
1766 fontsConf = makeFontsConf {
1867 fontDirectories = [ freefont_ttf ];
@@ -29,7 +78,9 @@ let
2978 # Currently broken on Aarch64
3079 haveFlashrom = isx86;
3180
32−in stdenv.mkDerivation rec {
81+in
82+
83+stdenv.mkDerivation rec {
3384 pname = "fwupd";
3485 version = "1.2.8";
3586
@@ -41,15 +92,51 @@ in stdenv.mkDerivation rec {
4192 outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
4293
4394 nativeBuildInputs = [
44− meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info
45− valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala
95+ meson
96+ ninja
97+ gtk-doc
98+ pkgconfig
99+ gobject-introspection
100+ intltool
101+ shared-mime-info
102+ valgrind
103+ gcab
104+ docbook_xml_dtd_43
105+ docbook_xsl
106+ help2man
107+ libxslt
108+ python
109+ wrapGAppsHook
110+ vala
46111 ];
47112
48113 buildInputs = [
49− polkit libxmlb gusb sqlite libarchive libsoup elfutils gnu-efi libyaml
50− libgudev colord gpgme libuuid gnutls glib-networking json-glib umockdev
51− bash-completion cairo freetype fontconfig pango efivar
52− ] ++ stdenv.lib.optionals haveDell [ libsmbios ];
114+ polkit
115+ libxmlb
116+ gusb
117+ sqlite
118+ libarchive
119+ libsoup
120+ elfutils
121+ gnu-efi
122+ libyaml
123+ libgudev
124+ colord
125+ gpgme
126+ libuuid
127+ gnutls
128+ glib-networking
129+ json-glib
130+ umockdev
131+ bash-completion
132+ cairo
133+ freetype
134+ fontconfig
135+ pango
136+ efivar
137+ ] ++ stdenv.lib.optionals haveDell [
138+ libsmbios
139+ ];
53140
54141 patches = [
55142 ./fix-paths.patch
@@ -85,9 +172,12 @@ in stdenv.mkDerivation rec {
85172 # doCheck = true;
86173
87174 preFixup = let
88− binPath = [ efibootmgr bubblewrap tpm2-tools ] ++ stdenv.lib.optional haveFlashrom flashrom;
89− in
90− ''
175+ binPath = [
176+ efibootmgr
177+ bubblewrap
178+ tpm2-tools
179+ ] ++ stdenv.lib.optional haveFlashrom flashrom;
180+ in ''
91181 gappsWrapperArgs+=(
92182 --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
93183 # See programs reached with fu_common_find_program_in_path in source