Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
730 changed files with 3907 additions and 1907 deletions
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
, curl, glib, gnome, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl glib json-glib libnotify libsecret sqlite gumbo gtk3
libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas
libgee libpeas gnome.libsoup librest webkitgtk gsettings-desktop-schemas
gnome-online-accounts
] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
description = "A modern desktop application designed to complement existing web-based RSS accounts";
homepage = "https://jangernert.github.io/FeedReader/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ edwtjo worldofpeace ];
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux;
};
}