From 301d342dca3d2ac244c07728bbbe6beefee0f62a Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Thu, 12 Sep 2024 00:09:27 +0200
Subject: [PATCH] protonvpn-gui/proton-*: refactor to use build-system and
 dependencies

---
 pkgs/applications/networking/protonvpn-gui/default.nix     | 7 ++++++-
 pkgs/development/python-modules/proton-core/default.nix    | 4 ++--
 .../proton-keyring-linux-secretservice/default.nix         | 4 ++--
 .../python-modules/proton-keyring-linux/default.nix        | 4 ++--
 .../python-modules/proton-vpn-api-core/default.nix         | 4 ++--
 .../python-modules/proton-vpn-connection/default.nix       | 4 ++--
 .../default.nix                                            | 5 ++++-
 .../proton-vpn-killswitch-network-manager/default.nix      | 5 ++++-
 .../python-modules/proton-vpn-killswitch/default.nix       | 4 ++--
 .../python-modules/proton-vpn-logger/default.nix           | 6 ++++--
 .../proton-vpn-network-manager-openvpn/default.nix         | 5 ++++-
 .../proton-vpn-network-manager-wireguard/default.nix       | 5 ++++-
 .../python-modules/proton-vpn-network-manager/default.nix  | 5 ++++-
 .../python-modules/proton-vpn-session/default.nix          | 6 ++++--
 14 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix
index f0349f09b720..9484a1c42dcf 100644
--- a/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/pkgs/applications/networking/protonvpn-gui/default.nix
@@ -55,7 +55,7 @@ buildPythonApplication rec {
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dbus-python
     packaging
     proton-core
@@ -80,6 +80,11 @@ buildPythonApplication rec {
     install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps
   '';
 
+  preCheck = ''
+    # Needed for Permission denied: '/homeless-shelter'
+    export HOME=$(mktemp -d)
+  '';
+
   # Gets a segmentation fault after the widgets test
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix
index d42dc2c8954f..12df2934bff2 100644
--- a/pkgs/development/python-modules/proton-core/default.nix
+++ b/pkgs/development/python-modules/proton-core/default.nix
@@ -25,9 +25,9 @@ buildPythonPackage rec {
     hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     bcrypt
     aiohttp
     pyopenssl
diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix
index 7d4a36b5e5e8..4bb419d21b20 100644
--- a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix
+++ b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix
@@ -20,9 +20,9 @@ buildPythonPackage rec {
     hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ proton-keyring-linux ];
+  dependencies = [ proton-keyring-linux ];
 
   pythonImportsCheck = [ "proton.keyring_linux" ];
 
diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix
index ad5b4d46779c..51617e71a0f8 100644
--- a/pkgs/development/python-modules/proton-keyring-linux/default.nix
+++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix
@@ -21,9 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     keyring
     proton-core
   ];
diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
index 0191084642dd..219dd94b3142 100644
--- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
@@ -26,9 +26,9 @@ buildPythonPackage rec {
     hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     distro
     proton-core
     proton-vpn-connection
diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix
index d527df7fbbd6..7da811dc3a31 100644
--- a/pkgs/development/python-modules/proton-vpn-connection/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-connection/default.nix
@@ -23,9 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jinja2
     proton-core
     proton-vpn-killswitch
diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix
index e5dcedfb6d3b..8ff9321fc57c 100644
--- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix
@@ -30,10 +30,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     # Solves ImportError: cannot import name NM, introspection typelib not found
     gobject-introspection
+  ];
+
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     # Needed here for the NM namespace
     networkmanager
     proton-vpn-api-core
diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix
index 5dbf2eb5fe73..c8d30741930c 100644
--- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix
@@ -29,10 +29,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     # Solves ImportError: cannot import name NM, introspection typelib not found
     gobject-introspection
+  ];
+
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     # Needed here for the NM namespace
     networkmanager
     proton-vpn-api-core
diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix
index 65633318496e..ae83dd1e5baa 100644
--- a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix
@@ -20,9 +20,9 @@ buildPythonPackage rec {
     hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ proton-core ];
+  dependencies = [ proton-core ];
 
   pythonImportsCheck = [ "proton.vpn.killswitch.interface" ];
 
diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix
index 7211293b99c8..402b6e0e4910 100644
--- a/pkgs/development/python-modules/proton-vpn-logger/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-logger/default.nix
@@ -20,9 +20,11 @@ buildPythonPackage rec {
     hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
-  propagatedBuildInputs = [ proton-core ];
+  dependencies = [ proton-core ];
 
   pythonImportsCheck = [ "proton.vpn.logging" ];
 
diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix
index 3cdbc53aa6e8..25c9715e7e6b 100644
--- a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix
@@ -25,10 +25,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     # Solves Namespace NM not available
     gobject-introspection
+  ];
+
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     proton-core
     proton-vpn-network-manager
   ];
diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix
index 516b3306fc6b..e32a4b5a1b88 100644
--- a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix
@@ -26,10 +26,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     # Solves Namespace NM not available
     gobject-introspection
+  ];
+
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     proton-core
     proton-vpn-killswitch-network-manager-wireguard
     proton-vpn-network-manager
diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
index 4409103ca7d6..fea0d2e304d0 100644
--- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
@@ -30,10 +30,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     # Needed to recognize the NM namespace
     gobject-introspection
+  ];
+
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     # Needed here for the NM namespace
     networkmanager
     proton-core
diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix
index c74e55d1b8f4..ee27bfb9b466 100644
--- a/pkgs/development/python-modules/proton-vpn-session/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-session/default.nix
@@ -28,9 +28,11 @@ buildPythonPackage rec {
     hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     cryptography
     distro
     proton-core