From 5ee8efb7c500ba2226172b8e6c9e50cd9b54600e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 7 Aug 2019 14:19:05 -0400 Subject: [PATCH] gnome3.gnome-software: disable fwupd aarch64 Needed temporarily because of #66277. --- .../gnome-3/core/gnome-software/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index e301305d405..6d487597900 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -3,6 +3,12 @@ , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts, hicolor-icon-theme , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: +let + + withFwupd = stdenv.isx86_64 || stdenv.isi686; + +in + stdenv.mkDerivation rec { name = "gnome-software-${version}"; version = "3.32.4"; @@ -29,13 +35,16 @@ stdenv.mkDerivation rec { gtk3 glib packagekit appstream-glib libsoup gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree - polkit flatpak fwupd - libxmlb gnome-online-accounts + polkit flatpak libxmlb gnome-online-accounts + ] ++ stdenv.lib.optionals withFwupd [ + fwupd ]; mesonFlags = [ "-Dubuntu_reviews=false" "-Dgudev=false" + ] ++ stdenv.lib.optionals (!withFwupd) [ + "-Dfwupd=false" ]; passthru = {