diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-18 00:41:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-18 00:41:48 +0100 |
commit | b4f7a460fbf43787d1e1ed3b9cec2df00a55c882 (patch) | |
tree | fd5d9476e5ae1f38fa19115001a1256900db9cf2 /pkgs/applications/networking | |
parent | 5e4d6e627ef0a6dd06bc4ac094ef2f97770f9f06 (diff) | |
parent | a95e947c816db6a13a2a2099df9471d30850547d (diff) | |
download | nixpkgs-b4f7a460fbf43787d1e1ed3b9cec2df00a55c882.tar nixpkgs-b4f7a460fbf43787d1e1ed3b9cec2df00a55c882.tar.gz nixpkgs-b4f7a460fbf43787d1e1ed3b9cec2df00a55c882.tar.bz2 nixpkgs-b4f7a460fbf43787d1e1ed3b9cec2df00a55c882.tar.lz nixpkgs-b4f7a460fbf43787d1e1ed3b9cec2df00a55c882.tar.xz nixpkgs-b4f7a460fbf43787d1e1ed3b9cec2df00a55c882.tar.zst nixpkgs-b4f7a460fbf43787d1e1ed3b9cec2df00a55c882.zip |
Merge pull request #147520 from WolfangAukang/protonvpn-gui-improv
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/protonvpn-gui/default.nix | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index b6583efe730..ecfde0a39c2 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,8 +1,21 @@ -{ lib, fetchFromGitHub, gobject-introspection, imagemagick, -wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, gobject-introspection +, imagemagick +, networkmanager +, pango +, webkitgtk +# Python libs +, protonvpn-nm-lib +, psutil +# Optionals +, withIndicator ? true +, libappindicator-gtk3 }: -python3Packages.buildPythonApplication rec { - pname = "protonvpn-linux-gui"; +buildPythonApplication rec { + pname = "protonvpn-gui"; version = "1.7.0"; src = fetchFromGitHub { @@ -12,22 +25,26 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw="; }; - strictDeps = false; - nativeBuildInputs = [ - gobject-introspection imagemagick wrapGAppsHook + gobject-introspection + imagemagick + wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ protonvpn-nm-lib psutil ]; buildInputs = [ - gtk3 networkmanager webkitgtk - ]; + # To avoid enabling strictDeps = false (#56943) + gobject-introspection + networkmanager + pango + webkitgtk + ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; - postFixup = '' + postInstall = '' # Setting icons for size in 16 32 48 64 72 96 128 192 512 1024; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps @@ -45,9 +62,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "Linux GUI for ProtonVPN, written in Python"; + description = "Official ProtonVPN Linux app"; homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = with maintainers; [ offline wolfangaukang ]; + maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; |