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

newsboat: 2.13 -> 2.14

Browse Source
This commit is contained in:
Robert Schütz 2018-12-29 22:33:55 +01:00 committed by Silvan Mosberger
parent aebec73071
commit a513ddb6ed
No known key found for this signature in database
GPG Key ID: 9424360B4B85C9E7
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,17 @@
{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses { stdenv, rustPlatform, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }: , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:
stdenv.mkDerivation rec { rustPlatform.buildRustPackage rec {
name = "newsboat-${version}"; name = "newsboat-${version}";
version = "2.13"; version = "2.14";
src = fetchurl { src = fetchurl {
url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
sha256 = "0pik1d98ydzqi6055vdbkjg5krwifbk2hy2f5jp5p1wcy2s16dn7"; sha256 = "13bdwnwxa66c69lqhb02basff0aa6q1jhl7fgahcxmdy7snbmg37";
}; };
cargoSha256 = "11s50qy1b833r2b5kr1wx9imi9h7s00c0hs36ricgbd0xw7n76hd";
prePatch = '' prePatch = ''
substituteInPlace Makefile --replace "|| true" "" substituteInPlace Makefile --replace "|| true" ""
# Allow other ncurses versions on Darwin # Allow other ncurses versions on Darwin
@ -18,18 +20,25 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ]
++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ]; ++ 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 ]
++ stdenv.lib.optional stdenv.isDarwin Security;
makeFlags = [ "prefix=$(out)" ]; postBuild = ''
make
doCheck = true; '';
checkTarget = "test";
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
doCheck = true;
checkPhase = ''
make test
'';
postInstall = '' postInstall = ''
make prefix="$out" install
cp -r contrib $out cp -r contrib $out
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do for prog in $out/bin/*; do

4
pkgs/top-level/all-packages.nix
View File

@ -4427,7 +4427,9 @@ in
networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { };
newsboat = callPackage ../applications/networking/feedreaders/newsboat { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat {
inherit (darwin.apple_sdk.frameworks) Security;
};
nextcloud = callPackage ../servers/nextcloud { }; nextcloud = callPackage ../servers/nextcloud { };