diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/by-name/pr/protonvpn-gui/package.nix
similarity index 87%
rename from pkgs/applications/networking/protonvpn-gui/default.nix
rename to pkgs/by-name/pr/protonvpn-gui/package.nix
index ae888ee750e9..49a7b2669187 100644
--- a/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/pkgs/by-name/pr/protonvpn-gui/package.nix
@@ -1,26 +1,16 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
   gobject-introspection,
-  setuptools,
   wrapGAppsHook3,
   libnotify,
-  dbus-python,
-  packaging,
-  proton-core,
-  proton-keyring-linux,
-  proton-vpn-api-core,
-  proton-vpn-local-agent,
-  proton-vpn-network-manager,
-  pycairo,
-  pygobject3,
   withIndicator ? true,
   libappindicator-gtk3,
   libayatana-appindicator,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "protonvpn-gui";
   version = "4.12.0";
   pyproject = true;
@@ -48,11 +38,11 @@ buildPythonApplication rec {
     libayatana-appindicator
   ];
 
-  build-system = [
+  build-system = with python3Packages; [
     setuptools
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     dbus-python
     packaging
     proton-core
@@ -64,6 +54,12 @@ buildPythonApplication rec {
     pygobject3
   ];
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   postInstall = ''
     mkdir -p $out/share/{applications,pixmaps}
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 594372aac537..48e98f52bfae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11901,8 +11901,6 @@ with pkgs;
     // (config.profanity or { })
   );
 
-  protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { };
-
   psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
 
   psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };