1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 9deca1faa6a0..a67a052e5fee 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -2,15 +2,15 @@
 , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking
 , libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar, glibcLocales
 , fwupdate, libyaml, valgrind, meson, libuuid, pygobject3, colord
-, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook
+, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook, json_glib
 }:
 let
-  version = "1.0.2";
+  version = "1.0.4";
 in stdenv.mkDerivation {
   name = "fwupd-${version}";
   src = fetchurl {
     url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-    sha256 = "15hrl6jq2kyvbxgjkv3qafqj2962il27gryakm39kvz2p2l1bacj";
+    sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3";
   };
 
   nativeBuildInputs = [
@@ -19,17 +19,11 @@ in stdenv.mkDerivation {
   ];
   buildInputs = [
     polkit appstream-glib gusb sqlite libarchive libsoup libelf libsmbios fwupdate libyaml
-    libgudev colord gpgme libuuid pillow gnutls glib_networking
+    libgudev colord gpgme libuuid pillow gnutls glib_networking efivar json_glib
   ];
 
   LC_ALL = "en_US.UTF-8"; # For po/make-images
 
-  NIX_CFLAGS_COMPILE = [
-    "-I${efivar}/include/efivar"
-    # warning: "__LIBELF_INTERNAL__" is not defined
-    "-Wno-error=undef"
-  ];
-
   patches = [
     ./fix-missing-deps.patch
   ];
@@ -38,12 +32,12 @@ in stdenv.mkDerivation {
   '';
 
   mesonFlags = [
-    "-Denable-man=false"
-    "-Denable-tests=false"
-    "-Denable-doc=false"
-    "-Dwith-bootdir=/boot"
-    "-Dwith-udevdir=lib/udev"
-    "-Dwith-systemdunitdir=lib/systemd/system"
+    "-Dman=false"
+    "-Dtests=false"
+    "-Dgtkdoc=false"
+    "-Dbootdir=/boot"
+    "-Dudevdir=lib/udev"
+    "-Dsystemdunitdir=lib/systemd/system"
     "--localstatedir=/var"
   ];