nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 19:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitmask-vpn: install the app's icon (#168904)

Browse Source 
* bitmask-vpn: install the app's icon

* bitmask-vpn: fix the desktop entry path

* bitmask-vpn: use the unused variable `pname`
This commit is contained in:
Haz 2022-04-21 01:57:19 +02:00 committed by GitHub
parent 786f0c486b
commit c30b0af1bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/bitmask-vpn/default.nix
View File

@ -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.