diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index ca2d32af37a7..eed34a6e10fe 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, @@ -10,6 +11,7 @@ qt6, qtpy, pyqt6, + mesa, pytestCheckHook, pytest-cov-stub, }: @@ -17,9 +19,9 @@ buildPythonPackage rec { pname = "echo"; version = "0.11.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "glue-viz"; @@ -28,15 +30,18 @@ buildPythonPackage rec { sha256 = "sha256-Uikzn9vbLctiZ6W0uA6hNvr7IB/FhCcHk+JxBW7yrA4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm + ]; + + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; - propagatedBuildInputs = [ + dependencies = [ qt6.qtconnectivity qt6.qtbase qt6.qttools @@ -45,11 +50,14 @@ buildPythonPackage rec { qtpy ]; - # collecting ... qt.qpa.xcb: could not connect to display - # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. - doCheck = false; + doCheck = lib.meta.availableOn stdenv.hostPlatform mesa.llvmpipeHook; + + preCheck = '' + export QT_QPA_PLATFORM=offscreen + ''; nativeCheckInputs = [ + mesa.llvmpipeHook pytestCheckHook pytest-cov-stub ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a86282b1e3e..9735168761ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4571,7 +4571,9 @@ self: super: with self; { ecdsa = callPackage ../development/python-modules/ecdsa { }; - echo = callPackage ../development/python-modules/echo { }; + echo = callPackage ../development/python-modules/echo { + inherit (pkgs) mesa; + }; ecoaliface = callPackage ../development/python-modules/ecoaliface { };