Unverified Commit 301d342d authored by Sebastian Sellmeier's avatar Sebastian Sellmeier
Browse files

protonvpn-gui/proton-*: refactor to use build-system and dependencies

parent 96c8a4f1

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

+6 −1
Original line number Diff line number Diff line
@@ -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;

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

+2 −2
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ buildPythonPackage rec { 
    hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ=";

  };



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

  dependencies = [

    bcrypt

    aiohttp

    pyopenssl

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

+2 −2
Original line number Diff line number Diff line
@@ -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" ];

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

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ buildPythonPackage rec { 
    hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU=";

  };



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

  dependencies = [

    keyring

    proton-core

  ];

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

+2 −2
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ buildPythonPackage rec { 
    hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI=";

  };



  nativeBuildInputs = [ setuptools ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

  dependencies = [

    distro

    proton-core

    proton-vpn-connection