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

feedreader: fix finding libcurl

Browse Source
This commit is contained in:
worldofpeace 2019-01-28 13:32:27 -05:00
parent b55c113be2
commit 2c84b7b4a1
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/networking/feedreaders/feedreader/default.nix
View File

@ -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 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo
}: }:
let stdenv.mkDerivation rec {
pname = "FeedReader"; pname = "feedreader";
version = "2.6.2"; version = "2.6.2";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jangernert"; owner = "jangernert";
repo = pname; repo = pname;
rev = "v" + version; rev = "v${version}";
sha256 = "1x5milynfa27zyv2jkzyi7ikkszrvzki1hlzv8c2wvcmw60jqb8n"; sha256 = "1x5milynfa27zyv2jkzyi7ikkszrvzki1hlzv8c2wvcmw60jqb8n";
}; };
patches = [
# See: https://github.com/jangernert/FeedReader/pull/842
(fetchpatch {
url = "https://github.com/worldofpeace/FeedReader/commit/22298dd6c14c3d3655bee531dfbdc87d558f50b1.patch";
sha256 = "076fpjn973xg2m35lc6z4h7g5x8nb08sghg94glsqa8wh1ig2311";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils
python3 glibcLocales wrapGAppsHook python3 glibcLocales wrapGAppsHook
@ -30,9 +36,6 @@ in stdenv.mkDerivation {
gstreamer gst-plugins-base gst-plugins-good 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 # vcs_tag function fails with UnicodeDecodeError
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
@ -41,7 +44,7 @@ in stdenv.mkDerivation {
''; '';
meta = with stdenv.lib; { 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/; homepage = https://jangernert.github.io/FeedReader/;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ edwtjo ]; maintainers = with maintainers; [ edwtjo ];