diff options
| author | Haz <zyptoskid@yahoo.com> | 2022-04-21 01:57:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 01:57:19 +0200 |
| commit | c30b0af1bd6909d667a69cd0e15c3e112366c693 (patch) | |
| tree | db46ff777bf6c7df281a0096d1586d0b6c24a231 /pkgs/tools/networking/bitmask-vpn/default.nix | |
| parent | 786f0c486bb6ea6ace6f331fb2162e0874eaba11 (diff) | |
bitmask-vpn: install the app's icon (#168904)
* bitmask-vpn: install the app's icon * bitmask-vpn: fix the desktop entry path * bitmask-vpn: use the unused variable `pname`
Diffstat (limited to 'pkgs/tools/networking/bitmask-vpn/default.nix')
| -rw-r--r-- | pkgs/tools/networking/bitmask-vpn/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix index 35f2e801f5316..8924924448e4e 100644 --- a/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/pkgs/tools/networking/bitmask-vpn/default.nix @@ -78,6 +78,9 @@ buildGoModule rec { substituteInPlace providers/vendor.conf \ --replace "provider = riseup" "provider = ${provider}" + substituteInPlace branding/templates/debian/app.desktop-template \ + --replace "Icon=icon" "Icon=${pname}" + patchShebangs gui/build.sh wrapPythonProgramsIn branding/scripts '' + lib.optionalString stdenv.isLinux '' @@ -130,11 +133,12 @@ buildGoModule rec { ''; postInstall = '' - install -m 755 -D -t $out/bin build/qt/release/${provider}-vpn + install -m 755 -D -t $out/bin build/qt/release/${pname} VERSION=${version} VENDOR_PATH=providers branding/scripts/generate-debian branding/templates/debian/data.json (cd branding/templates/debian && ${python3Packages.python}/bin/python3 generate.py) - install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${provider}-vpn.desktop + install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${pname}.desktop + install -m 444 -D providers/${provider}/assets/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg '' + lib.optionalString stdenv.isLinux '' install -m 444 -D -t $out/share/polkit-1/actions ${bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy ''; @@ -154,7 +158,7 @@ buildGoModule rec { a variety of trusted service provider all from one app. Current providers include Riseup Networks and The Calyx Institute, where the former is default. - The <literal>${provider}-vpn</literal> executable should appear + The <literal>${pname}</literal> executable should appear in your desktop manager's XDG menu or could be launch in a terminal to get an execution log. A new icon should then appear in your systray to control the VPN and configure some options. |