diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-10 11:23:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-10 11:23:57 -0400 |
commit | 2eaef474f2e9cfa34c7273c1b6cf0ea74829510b (patch) | |
tree | a2b169af1377329d843650e9027706ca8fab2fec /pkgs/desktops | |
parent | 1ce7ece4b25a415e78b4fd1a7dce4c3e98f8a020 (diff) | |
parent | 45643baf2265826e05488064144cdd5911f62788 (diff) |
Merge pull request #66236 from worldofpeace/test-reorganize
Reorganize GNOME tests, re-enable LightDM for release-combined
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-software/default.nix | 13 |
1 files 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 e301305d405de..6d48759790076 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 = { |