alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #147520 from WolfangAukang/protonvpn-gui-improv

Browse source
This commit is contained in:
Sandro 2022-03-18 00:41:48 +01:00 committed by GitHub
parent 5e4d6e627e a95e947c81
commit b4f7a460fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkgs/applications/networking/protonvpn-gui/default.nix
View file

@ -1,8 +1,21 @@
{ lib, fetchFromGitHub, gobject-introspection, imagemagick, { lib
wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }: , buildPythonApplication
, fetchFromGitHub
, wrapGAppsHook
, gobject-introspection
, imagemagick
, networkmanager
, pango
, webkitgtk
# Python libs
, protonvpn-nm-lib
, psutil
# Optionals
, withIndicator ? true
, libappindicator-gtk3 }:
python3Packages.buildPythonApplication rec { buildPythonApplication rec {
pname = "protonvpn-linux-gui"; pname = "protonvpn-gui";
version = "1.7.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -12,22 +25,26 @@ python3Packages.buildPythonApplication rec {
sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw="; sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw=";
}; };
strictDeps = false;
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection imagemagick wrapGAppsHook gobject-introspection
imagemagick
wrapGAppsHook
]; ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = [
protonvpn-nm-lib protonvpn-nm-lib
psutil psutil
]; ];
buildInputs = [ buildInputs = [
gtk3 networkmanager webkitgtk # To avoid enabling strictDeps = false (#56943)
]; gobject-introspection
networkmanager
pango
webkitgtk
] ++ lib.optionals withIndicator [ libappindicator-gtk3 ];
postFixup = '' postInstall = ''
# Setting icons # Setting icons
for size in 16 32 48 64 72 96 128 192 512 1024; do for size in 16 32 48 64 72 96 128 192 512 1024; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
@ -45,9 +62,9 @@ python3Packages.buildPythonApplication rec {
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {
description = "Linux GUI for ProtonVPN, written in Python"; description = "Official ProtonVPN Linux app";
homepage = "https://github.com/ProtonVPN/linux-app"; homepage = "https://github.com/ProtonVPN/linux-app";
maintainers = with maintainers; [ offline wolfangaukang ]; maintainers = with maintainers; [ wolfangaukang ];
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };

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

@ -28497,7 +28497,7 @@ with pkgs;
protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };
protonvpn-gui = callPackage ../applications/networking/protonvpn-gui { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { };
ps2client = callPackage ../applications/networking/ps2client { }; ps2client = callPackage ../applications/networking/ps2client { };