philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

newsboat: 2.20.1 -> 2.21 

Add missing deps for Darwin, and tell it where gettext is installed.
gstqt5
Doron Behar 2020-09-22 17:27:17 +03:00
parent 06b27898a4
commit a8ff9be2b6
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,26 +1,29 @@
{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses { stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses
, asciidoctor, libiconv, Security, makeWrapper }: , asciidoctor, libiconv, Security, Foundation, makeWrapper }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "newsboat"; pname = "newsboat";
version = "2.20.1"; version = "2.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "newsboat"; owner = "newsboat";
repo = "newsboat"; repo = "newsboat";
rev = "r${version}"; rev = "r${version}";
sha256 = "1i9dpkdlsm3ya0w2x4c8kplrp3qzd8slbkcqvzfpqggb67gvczvv"; sha256 = "0ignfmh5193bigvk9f057r0r4yaxymxv2afycn2b98w05gljccb6";
}; };
cargoSha256 = "1ykffx2lhn4w56qm1wypkg9wsqpvzzrz419qkl95w1384xf3f7ix"; cargoSha256 = "16652i2hbs6d3fam2hdlc947i5nrb3na186zfcb4nfh7hnb7lh8g";
postPatch = '' postPatch = ''
substituteInPlace Makefile --replace "|| true" "" substituteInPlace Makefile --replace "|| true" ""
'' + stdenv.lib.optionalString stdenv.isDarwin '' ''
# Allow other ncurses versions on Darwin # TODO: Check if that's still needed
substituteInPlace config.sh \ + stdenv.lib.optionalString stdenv.isDarwin ''
--replace "ncurses5.4" "ncurses" # Allow other ncurses versions on Darwin
''; substituteInPlace config.sh \
--replace "ncurses5.4" "ncurses"
''
;
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -29,7 +32,7 @@ rustPlatform.buildRustPackage rec {
] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ];
buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv gettext ]; ++ stdenv.lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ];
postBuild = '' postBuild = ''
make prefix="$out" make prefix="$out"
@ -38,6 +41,13 @@ rustPlatform.buildRustPackage rec {
# TODO: Check if that's still needed # TODO: Check if that's still needed
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
# https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set
# these for all platforms, since upstream's gettext crate behavior might
# change in the future.
GETTEXT_LIB_DIR = "${stdenv.lib.getLib gettext}/lib";
GETTEXT_INCLUDE_DIR = "${stdenv.lib.getDev gettext}/include";
GETTEXT_BIN_DIR = "${stdenv.lib.getBin gettext}/bin";
doCheck = true; doCheck = true;
preCheck = '' preCheck = ''

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

@ -5745,7 +5745,7 @@ in
nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { }; nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { };
newsboat = callPackage ../applications/networking/feedreaders/newsboat { newsboat = callPackage ../applications/networking/feedreaders/newsboat {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security Foundation;
}; };
grocy = callPackage ../servers/grocy { }; grocy = callPackage ../servers/grocy { };