diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:48 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:48 +0200 |
| commit | f8a9c6efac0199d72884e82117636b5896b7e202 (patch) | |
| tree | db5a22587988bce5c645768fc9b40556f5708493 /pkgs/applications/networking/feedreaders/newsboat/default.nix | |
| parent | 682b7c2a1936c4d4298ce10629f2bd99d2fb54fb (diff) | |
| parent | 7f40cfd97b4df5bcb039c0efb0710abf47b849b8 (diff) | |
| download | nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.gz nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.bz2 nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.lz nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.xz nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.zst nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications/networking/feedreaders/newsboat/default.nix')
| -rw-r--r-- | pkgs/applications/networking/feedreaders/newsboat/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 5b97859304cb..74a43f00ca83 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace Makefile --replace "|| true" "" + '' + stdenv.lib.optionalString stdenv.isDarwin '' # Allow other ncurses versions on Darwin substituteInPlace config.sh \ --replace "ncurses5.4" "ncurses" @@ -25,13 +26,13 @@ rustPlatform.buildRustPackage rec { pkgconfig asciidoctor gettext - ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv gettext ]; postBuild = '' - make + make prefix="$out" ''; # TODO: Check if that's still needed |