diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index d8b88031501f..f3e32f195fc0 100644 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -1,46 +1,34 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab -, fetchpatch , appstream-glib , desktop-file-utils , fwupd , gettext , glib -, gtk3 -, libsoup +, gtk4 +, libadwaita , libxmlb , meson , ninja , pkg-config , systemd , help2man -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "gnome-firmware"; - version = "3.34.0"; + version = "42.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = version; - sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l"; + sha256 = "9QZ98EElENWsME/jXoj9YJl2e+ipyLm0g4grQUwmnuE="; }; - patches = [ - # Fixes manual build - (fetchpatch { - url = "https://gitlab.gnome.org/World/gnome-firmware/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch"; - sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/World/gnome-firmware/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch"; - sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1"; - }) - ]; - nativeBuildInputs = [ appstream-glib # for ITS rules desktop-file-utils @@ -49,14 +37,14 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ fwupd glib - gtk3 - libsoup + gtk4 + libadwaita libxmlb systemd ];