newsboat: 2.13 -> 2.14 #53054
Merged
newsboat: 2.13 -> 2.14 #53054
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
10.rebuild-darwin: 1-10
10.rebuild-linux: 1-10
and removed
6.topic: rust
labels
|
This patch makes the build work on Darwin: diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 9d7bddaefff..3fe0942d819 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -1,5 +1,5 @@
{ 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, makeWrapper, Security }:
rustPlatform.buildRustPackage rec {
name = "newsboat-${version}";
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage 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 Security ];
postBuild = ''
make
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0ccf05902d..f827a69d491 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };Other than that this looks good to me. |
infinisil
force-pushed
the
newsboat-2.14
branch
from
a5ae9e5
to
a513ddb
Compare
|
I took the liberty to squash my diff into your commit in order to not introduce a single commit that breaks the build, I hope you don't mind. |
|
I don't. Thanks a lot! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Starting with this release, they also use Rust: https://github.com/newsboat/newsboat/blob/master/CHANGELOG.md#214---2018-12-29
Someone familiar with Nixpkgs' Rust infrastructure should have a look at this.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)