From cfc583ddcd48182824dc1550144f8e25f1fea6d2 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 13 Nov 2021 14:59:21 +0200 Subject: [PATCH] alfis: 0.6.5 -> 0.6.9 --- .../blockchains/alfis/default.nix | 28 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index e1fd262eb772..ee64b7907aa0 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -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 \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c6b850e8f57..ffd156b50448 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29569,7 +29569,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 {