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

Merge pull request #144789 from legendofmiracles/wiki-tui

Browse Source 
wiki-tui: 0.3.4 -> 0.4.1, fix build on darwin
This commit is contained in:
Domen Kožar 2021-11-06 07:08:22 -06:00 committed by GitHub
commit 64d85b687d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/misc/wiki-tui/default.nix
View File

@ -1,19 +1,25 @@
{ lib, rustPlatform, fetchCrate, ncurses, openssl, pkg-config }:
{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, nix-update-script, Security }:
rustPlatform.buildRustPackage rec {
pname = "wiki-tui";
version = "0.3.4";
version = "0.4.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-H+C1AbZ2zUhw6TNlSPaNaNuY5iNf39JW4q2g6uolevM=";
src = fetchFromGitHub {
owner = "Builditluc";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aCfYb5UvlWbBvBlwNjVIbOJlEV2b3+FD0qKO+9h5Nos=";
};
buildInputs = [ ncurses openssl ];
buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-PIt592nGtNEREQMukqRl/6KSJ/P32fWucHEMyOOc7BA=";
cargoSha256 = "sha256-dD8iC/b6KwElmq0RNdnHHC/jMWh7Q0/kMM+/zityHqQ=";
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
description = "A simple and easy to use Wikipedia Text User Interface";

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

@ -33022,7 +33022,9 @@ with pkgs;
wiki-js = callPackage ../servers/web-apps/wiki-js { };
wiki-tui = callPackage ../misc/wiki-tui { };
wiki-tui = callPackage ../misc/wiki-tui {
inherit (darwin.apple_sdk.frameworks) Security;
};
winePackagesFor = wineBuild: lib.makeExtensible (self: with self; {
callPackage = newScope self;