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

newsboat: clean up and fix on Darwin

Browse Source
This commit is contained in:
Robert Schütz 2018-01-22 00:43:05 +01:00
parent d60c026e54
commit 40f58e3515
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/feedreaders/newsboat/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, makeWrapper }: , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "newsboat-${version}"; name = "newsboat-${version}";
@ -12,16 +12,24 @@ stdenv.mkDerivation rec {
prePatch = '' prePatch = ''
substituteInPlace Makefile --replace "|| true" "" substituteInPlace Makefile --replace "|| true" ""
# Allow other ncurses versions on Darwin
substituteInPlace config.sh \
--replace "ncurses5.4" "ncurses"
''; '';
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ]
++ stdenv.lib.optional stdenv.isDarwin makeWrapper; ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ];
buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ];
installFlags = [ "DESTDIR=$(out)" "prefix=" ]; makeFlags = [ "prefix=$(out)" ];
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' doCheck = true;
checkTarget = "test";
postInstall = ''
cp -r contrib $out
'' + stdenv.lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
done done
@ -30,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://newsboat.org/; homepage = https://newsboat.org/;
description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console."; description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console.";
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [ dotlambda nicknovitski ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;
}; };