From c07e2bf52e04b8d5b755eed68029d0885ff053a1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 Nov 2021 19:10:25 -0500 Subject: [PATCH] alfis: use buildFeatures --- pkgs/applications/blockchains/alfis/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 0738661c0596..e1fd262eb772 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,12 +14,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1n7kb1lyghpkgdgd58pw8ldvfps30rnv5niwx35pkdg74h59hqgj"; - cargoBuildFlags = [ "--no-default-features" ] - ++ lib.optional withGui "--features webgui"; - - cargoTestFlags = [ "--no-default-features" ] - ++ lib.optional withGui "--features webgui"; - checkFlags = [ # these want internet access, disable them "--skip=dns::client::tests::test_tcp_client" @@ -30,6 +24,9 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional (withGui && stdenv.isLinux) webkitgtk ++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ]; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withGui "webgui"; + postInstall = lib.optionalString (withGui && stdenv.isLinux) '' wrapProgram $out/bin/alfis \ --prefix PATH : ${lib.makeBinPath [ zenity ]}