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

matrix-synapse: compile only against zenity & use wrapProgram instead of makeWrapper

Browse Source
This commit is contained in:
gardspirito 2021-11-08 17:25:59 +03:00
parent ad2f75b559
commit 01537c17e1
No known key found for this signature in database
GPG Key ID: 45A36EE2C8B0EAE3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/blockchains/alfis/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, withGui ? true { stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, withGui ? true
, webkitgtk, Cocoa, WebKit, dialog, makeWrapper }: , webkitgtk, Cocoa, WebKit, zenity, makeWrapper }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "alfis"; pname = "alfis";
@ -31,9 +31,8 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ]; ++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ];
postInstall = lib.optionalString (withGui && stdenv.isLinux) '' postInstall = lib.optionalString (withGui && stdenv.isLinux) ''
cp $out/bin/alfis{,_unwrapped} wrapProgram $out/bin/alfis \
makeWrapper $out/bin/alfis{_unwrapped,} \ --prefix PATH : ${lib.makeBinPath [ zenity ]}
--prefix PATH : ${lib.makeBinPath [ dialog ]}
''; '';
meta = with lib; { meta = with lib; {

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

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