diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2024-01-16 12:23:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 12:23:47 -0500 |
| commit | 9779ca85b3bcfb7f2e4da1940f862311e0261e9e (patch) | |
| tree | 9d5ba61939cad629973859528ead13a99d239669 /pkgs/applications/misc | |
| parent | b263ab4b464169289c25f5ed417aea66ed24189f (diff) | |
| parent | 495b938c3b1c5fe6c753705a60b2c673f8f41c6f (diff) | |
Merge pull request #281200 from andersrh/upgrade-electrum
electrum: add QtWayland and certifi
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/electrum/grs.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/electrum/ltc.nix | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index a1300983d28f2..65fb5c0171f01 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -8,6 +8,7 @@ , secp256k1 , enableQt ? true , callPackage +, qtwayland }: let @@ -53,6 +54,7 @@ python3.pkgs.buildPythonApplication { ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + buildInputs = lib.optional stdenv.isLinux qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -70,6 +72,7 @@ python3.pkgs.buildPythonApplication { qrcode requests tlslite-ng + certifi # plugins btchip-python ledger-bitcoin diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index 4850cfeb1da59..87a85e9f986dd 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -6,6 +6,7 @@ , zbar , secp256k1 , enableQt ? true +, qtwayland }: let @@ -35,6 +36,7 @@ python3.pkgs.buildPythonApplication { }; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + buildInputs = lib.optional stdenv.isLinux qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -53,6 +55,7 @@ python3.pkgs.buildPythonApplication { qrcode requests tlslite-ng + certifi # plugins btchip-python ledger-bitcoin diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 83738fd181494..844a49974b8f2 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -7,6 +7,7 @@ , zbar , secp256k1 , enableQt ? true +, qtwayland }: let @@ -70,6 +71,7 @@ python3.pkgs.buildPythonApplication { qrcode requests tlslite-ng + certifi # plugins btchip-python ckcc-protocol @@ -110,6 +112,7 @@ python3.pkgs.buildPythonApplication { ''; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + buildInputs = lib.optional stdenv.isLinux qtwayland; pytestFlagsArray = [ "electrum_ltc/tests" ]; |