From 2c84b7b4a140394198824b5936b68d7de9e9eeb4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 28 Jan 2019 13:32:27 -0500
Subject: [PATCH] feedreader: fix finding libcurl
---
.../feedreaders/feedreader/default.nix | 23 +++++++++++--------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index ea06936ab323..792371e28875 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -1,21 +1,27 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext, python3
+{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3
, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo
}:
-let
- pname = "FeedReader";
+stdenv.mkDerivation rec {
+ pname = "feedreader";
version = "2.6.2";
-in stdenv.mkDerivation {
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "jangernert";
repo = pname;
- rev = "v" + version;
+ rev = "v${version}";
sha256 = "1x5milynfa27zyv2jkzyi7ikkszrvzki1hlzv8c2wvcmw60jqb8n";
};
+ patches = [
+ # See: https://github.com/jangernert/FeedReader/pull/842
+ (fetchpatch {
+ url = "https://github.com/worldofpeace/FeedReader/commit/22298dd6c14c3d3655bee531dfbdc87d558f50b1.patch";
+ sha256 = "076fpjn973xg2m35lc6z4h7g5x8nb08sghg94glsqa8wh1ig2311";
+ })
+ ];
+
nativeBuildInputs = [
meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils
python3 glibcLocales wrapGAppsHook
@@ -30,9 +36,6 @@ in stdenv.mkDerivation {
gstreamer gst-plugins-base gst-plugins-good
]);
- # TODO: fix https://github.com/NixOS/nixpkgs/issues/39547
- LIBRARY_PATH = stdenv.lib.makeLibraryPath [ curl ];
-
# vcs_tag function fails with UnicodeDecodeError
LC_ALL = "en_US.UTF-8";
@@ -41,7 +44,7 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
- description = "A modern desktop application designed to complement existing web-based RSS accounts.";
+ 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 ];