mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 08:36:41 +01:00
newsboat: 2.13 -> 2.14
This commit is contained in:
parent
aebec73071
commit
a513ddb6ed
2 changed files with 23 additions and 12 deletions
|
@ -1,15 +1,17 @@
|
|||
{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
|
||||
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }:
|
||||
{ stdenv, rustPlatform, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
|
||||
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "newsboat-${version}";
|
||||
version = "2.13";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
|
||||
sha256 = "0pik1d98ydzqi6055vdbkjg5krwifbk2hy2f5jp5p1wcy2s16dn7";
|
||||
sha256 = "13bdwnwxa66c69lqhb02basff0aa6q1jhl7fgahcxmdy7snbmg37";
|
||||
};
|
||||
|
||||
cargoSha256 = "11s50qy1b833r2b5kr1wx9imi9h7s00c0hs36ricgbd0xw7n76hd";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace Makefile --replace "|| true" ""
|
||||
# Allow other ncurses versions on Darwin
|
||||
|
@ -20,16 +22,23 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ]
|
||||
++ 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)" ];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
postBuild = ''
|
||||
make
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
make test
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
make prefix="$out" install
|
||||
cp -r contrib $out
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
for prog in $out/bin/*; do
|
||||
|
|
|
@ -4427,7 +4427,9 @@ in
|
|||
|
||||
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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue