public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2019-10-03 01:47:08 +02:00
parent 3a4658ea04 3dc58eda52
commit b3fcd9375d
514 changed files with 8443 additions and 3195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/feedreaders/feedreader/default.nix
+9 -1
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}:
@@ -32,6 +32,14 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson_post_install.py
'';
patches = [
# Fixes build with libsecret
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/jangernert/FeedReader/pull/943.patch";
sha256 = "0anrwvcg6607dzvfrhy5qcnpxzflskb3iy3khdg191aw1h2mqhb5";
})
];
meta = with stdenv.lib; {
description = "A modern desktop application designed to complement existing web-based RSS accounts";
homepage = https://jangernert.github.io/FeedReader/;