From 495b938c3b1c5fe6c753705a60b2c673f8f41c6f Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Mon, 15 Jan 2024 19:37:58 +0100 Subject: [PATCH] electrum: add QtWayland and certifi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtWayland is added so that Electrum will work natively on Wayland. If you try to launch it on Wayland without QtWayland, you will get an error saying that QT couldn't find a module for Wayland. Certifi is added, because it's specified as a requirement for Electrum in their requirements.txt file here: https://github.com/spesmilo/electrum/blob/4.4.6/contrib/requirements/requirements.txt Co-Authored-By: Jörg Thalheim --- pkgs/applications/misc/electrum/default.nix | 3 +++ pkgs/applications/misc/electrum/grs.nix | 3 +++ pkgs/applications/misc/electrum/ltc.nix | 3 +++ 3 files changed, 9 insertions(+) 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" ];