summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-11-13 13:27:02 +0100
committerGitHub <noreply@github.com>2021-11-13 13:27:02 +0100
commit6b46e6b0f0e5c5bf794b6ff8d213b766a0f2ed70 (patch)
treefd9afea858429ad62fe1a6b6a80ad448c1370712 /pkgs
parentcaae37d0f4c9a887aa97a7cd46209abdba34d8a7 (diff)
parent01537c17e114abb5d784297249ce0f544b7536ff (diff)
Merge pull request #144635 from gardspirito/alfis-dialog
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/blockchains/alfis/default.nix12
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix
index 7a808d2c72e9..0738661c0596 100644
--- a/pkgs/applications/blockchains/alfis/default.nix
+++ b/pkgs/applications/blockchains/alfis/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config
-, withGui ? true, webkitgtk, Cocoa, WebKit
-}:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, withGui ? true
+, webkitgtk, Cocoa, WebKit, zenity, makeWrapper }:
rustPlatform.buildRustPackage rec {
pname = "alfis";
@@ -27,10 +26,15 @@ rustPlatform.buildRustPackage rec {
"--skip=dns::client::tests::test_udp_client"
];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = lib.optional (withGui && stdenv.isLinux) webkitgtk
++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ];
+ postInstall = lib.optionalString (withGui && stdenv.isLinux) ''
+ wrapProgram $out/bin/alfis \
+ --prefix PATH : ${lib.makeBinPath [ zenity ]}
+ '';
+
meta = with lib; {
description = "Alternative Free Identity System";
homepage = "https://alfis.name";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25f28f2cece7..f2d1001077b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29499,6 +29499,7 @@ with pkgs;
alfis = callPackage ../applications/blockchains/alfis {
inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
+ inherit (gnome) zenity;
};
alfis-nogui = alfis.override {
withGui = false;