Merge pull request #138103 from misuzu/alfis-update

This commit is contained in:
Sandro 2021-11-19 17:04:14 +01:00 committed by GitHub
commit 1ca1038ae5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 8 deletions

View File

@ -1,18 +1,29 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, withGui ? true
, webkitgtk, Cocoa, WebKit, zenity, makeWrapper }:
{ stdenv
, lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, makeWrapper
, webkitgtk
, zenity
, Cocoa
, Security
, WebKit
, withGui ? true
}:
rustPlatform.buildRustPackage rec {
pname = "alfis";
version = "0.6.5";
version = "0.6.9";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Alfis";
rev = "v${version}";
sha256 = "1g95yvkvlj78bqrk3p2xbhrmg1hrlgbyr1a4s7vg45y60zys2c2j";
sha256 = "1nnzy46hp1q9kcxzjx24d60frjhn3x46nksbqvdfcfrfn5pqrabh";
};
cargoSha256 = "1n7kb1lyghpkgdgd58pw8ldvfps30rnv5niwx35pkdg74h59hqgj";
cargoSha256 = "02liz8sqnqla77bqxfa8hj93qfj2x482q2bijz66rmazfig3b045";
checkFlags = [
# these want internet access, disable them
@ -21,11 +32,14 @@ rustPlatform.buildRustPackage rec {
];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = lib.optional (withGui && stdenv.isLinux) webkitgtk
buildInputs = lib.optional stdenv.isDarwin Security
++ lib.optional (withGui && stdenv.isLinux) webkitgtk
++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ];
buildNoDefaultFeatures = true;
buildFeatures = lib.optional withGui "webgui";
buildFeatures = [
"doh"
] ++ lib.optional withGui "webgui";
postInstall = lib.optionalString (withGui && stdenv.isLinux) ''
wrapProgram $out/bin/alfis \

View File

@ -29615,7 +29615,7 @@ with pkgs;
aeon = callPackage ../applications/blockchains/aeon { };
alfis = callPackage ../applications/blockchains/alfis {
inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit;
inherit (gnome) zenity;
};
alfis-nogui = alfis.override {