Skip to content

Commit

Permalink
protonvpn-gui: activate strictDeps
Browse files Browse the repository at this point in the history
  • Loading branch information
WolfangAukang committed Feb 25, 2022
1 parent 9ee5692 commit a95e947
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 14 deletions.
43 changes: 30 additions & 13 deletions pkgs/applications/networking/protonvpn-gui/default.nix
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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
Expand All @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28300,7 +28300,7 @@ with pkgs;

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 { };

Expand Down

0 comments on commit a95e947

Please sign in to comment.