lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

newsboat: clean up and fix on Darwin

+13 -5
+13 -5
pkgs/applications/networking/feedreaders/newsboat/default.nix
··· 1 1 { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses 2 - , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, makeWrapper }: 2 + , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "newsboat-${version}"; ··· 12 12 13 13 prePatch = '' 14 14 substituteInPlace Makefile --replace "|| true" "" 15 + # Allow other ncurses versions on Darwin 16 + substituteInPlace config.sh \ 17 + --replace "ncurses5.4" "ncurses" 15 18 ''; 16 19 17 20 nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] 18 - ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; 21 + ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; 19 22 20 23 buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; 21 24 22 - installFlags = [ "DESTDIR=$(out)" "prefix=" ]; 25 + makeFlags = [ "prefix=$(out)" ]; 23 26 24 - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' 27 + doCheck = true; 28 + checkTarget = "test"; 29 + 30 + postInstall = '' 31 + cp -r contrib $out 32 + '' + stdenv.lib.optionalString stdenv.isDarwin '' 25 33 for prog in $out/bin/*; do 26 34 wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" 27 35 done ··· 30 38 meta = with stdenv.lib; { 31 39 homepage = https://newsboat.org/; 32 40 description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console."; 33 - maintainers = with maintainers; [ dotlambda ]; 41 + maintainers = with maintainers; [ dotlambda nicknovitski ]; 34 42 license = licenses.mit; 35 43 platforms = platforms.unix; 36 44 };