Skip to content

Commit 301d342

Browse files
committed
protonvpn-gui/proton-*: refactor to use build-system and dependencies
1 parent 96c8a4f commit 301d342

File tree

14 files changed

+46
-22
lines changed

14 files changed

+46
-22
lines changed

pkgs/applications/networking/protonvpn-gui/default.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ buildPythonApplication rec {
5555
setuptools
5656
];
5757

58-
propagatedBuildInputs = [
58+
dependencies = [
5959
dbus-python
6060
packaging
6161
proton-core
@@ -80,6 +80,11 @@ buildPythonApplication rec {
8080
install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps
8181
'';
8282

83+
preCheck = ''
84+
# Needed for Permission denied: '/homeless-shelter'
85+
export HOME=$(mktemp -d)
86+
'';
87+
8388
# Gets a segmentation fault after the widgets test
8489
doCheck = false;
8590

pkgs/development/python-modules/proton-core/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ buildPythonPackage rec {
2525
hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ=";
2626
};
2727

28-
nativeBuildInputs = [ setuptools ];
28+
build-system = [ setuptools ];
2929

30-
propagatedBuildInputs = [
30+
dependencies = [
3131
bcrypt
3232
aiohttp
3333
pyopenssl

pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ buildPythonPackage rec {
2020
hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo=";
2121
};
2222

23-
nativeBuildInputs = [ setuptools ];
23+
build-system = [ setuptools ];
2424

25-
propagatedBuildInputs = [ proton-keyring-linux ];
25+
dependencies = [ proton-keyring-linux ];
2626

2727
pythonImportsCheck = [ "proton.keyring_linux" ];
2828

pkgs/development/python-modules/proton-keyring-linux/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ buildPythonPackage rec {
2121
hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU=";
2222
};
2323

24-
nativeBuildInputs = [ setuptools ];
24+
build-system = [ setuptools ];
2525

26-
propagatedBuildInputs = [
26+
dependencies = [
2727
keyring
2828
proton-core
2929
];

pkgs/development/python-modules/proton-vpn-api-core/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ buildPythonPackage rec {
2626
hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI=";
2727
};
2828

29-
nativeBuildInputs = [ setuptools ];
29+
build-system = [ setuptools ];
3030

31-
propagatedBuildInputs = [
31+
dependencies = [
3232
distro
3333
proton-core
3434
proton-vpn-connection

pkgs/development/python-modules/proton-vpn-connection/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ buildPythonPackage rec {
2323
hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8=";
2424
};
2525

26-
nativeBuildInputs = [ setuptools ];
26+
build-system = [ setuptools ];
2727

28-
propagatedBuildInputs = [
28+
dependencies = [
2929
jinja2
3030
proton-core
3131
proton-vpn-killswitch

pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ buildPythonPackage rec {
3030
nativeBuildInputs = [
3131
# Solves ImportError: cannot import name NM, introspection typelib not found
3232
gobject-introspection
33+
];
34+
35+
build-system = [
3336
setuptools
3437
];
3538

36-
propagatedBuildInputs = [
39+
dependencies = [
3740
# Needed here for the NM namespace
3841
networkmanager
3942
proton-vpn-api-core

pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ buildPythonPackage rec {
2929
nativeBuildInputs = [
3030
# Solves ImportError: cannot import name NM, introspection typelib not found
3131
gobject-introspection
32+
];
33+
34+
build-system = [
3235
setuptools
3336
];
3437

35-
propagatedBuildInputs = [
38+
dependencies = [
3639
# Needed here for the NM namespace
3740
networkmanager
3841
proton-vpn-api-core

pkgs/development/python-modules/proton-vpn-killswitch/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ buildPythonPackage rec {
2020
hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8=";
2121
};
2222

23-
nativeBuildInputs = [ setuptools ];
23+
build-system = [ setuptools ];
2424

25-
propagatedBuildInputs = [ proton-core ];
25+
dependencies = [ proton-core ];
2626

2727
pythonImportsCheck = [ "proton.vpn.killswitch.interface" ];
2828

pkgs/development/python-modules/proton-vpn-logger/default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ buildPythonPackage rec {
2020
hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I=";
2121
};
2222

23-
nativeBuildInputs = [ setuptools ];
23+
build-system = [
24+
setuptools
25+
];
2426

25-
propagatedBuildInputs = [ proton-core ];
27+
dependencies = [ proton-core ];
2628

2729
pythonImportsCheck = [ "proton.vpn.logging" ];
2830

0 commit comments

Comments
 (0)