diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-08 17:14:31 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-08 17:14:31 +0200 |
commit | 625ce6c7f66c0b2ccae30f95cdd9e48feed8561c (patch) | |
tree | c0c5a9d3510dc4dfa3008b9c35dbfea234894e81 /pkgs/development/python-modules/pywebview/default.nix | |
parent | 97490e67836cda5e181caf0a49f1e2d7ca31949f (diff) | |
parent | bf6abedefbebbec8f54cda97bd33bc06c5f46ed5 (diff) | |
download | nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.gz nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.bz2 nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.lz nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.xz nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.zst nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.zip |
Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e736d24dc7aa6749b5482c859147b17 and 187d0371ab3220ee40da1f616e4c48d85ac28986.
Diffstat (limited to 'pkgs/development/python-modules/pywebview/default.nix')
-rw-r--r-- | pkgs/development/python-modules/pywebview/default.nix | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 545fb236732..a020517dcce 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -1,25 +1,53 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, importlib-resources, pytest, xvfb_run }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, importlib-resources +, pyqtwebengine +, pytest +, pythonOlder +, qt5 +, xvfb_run +}: buildPythonPackage rec { pname = "pywebview"; - version = "3.3.1"; + version = "3.4"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; rev = version; - sha256 = "015z7n0hdgkzn0p7aw1xsv6lwc260p8q67jx0zyd1zghnwyj8k79"; + sha256 = "sha256-3JHwtw8oReolEl4k8cdt7GCVGNkfWWJN6EnZYHxzDO8="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + nativeBuildInputs = [ + qt5.wrapQtAppsHook + ]; - checkInputs = [ pytest xvfb_run ]; + propagatedBuildInputs = [ + pyqtwebengine + ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + + checkInputs = [ + pytest + xvfb_run + ]; checkPhase = '' + # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED + export HOME=$TMPDIR + # QStandardPaths: XDG_RUNTIME_DIR not set + export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir + pushd tests + substituteInPlace run.sh \ + --replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \ + --replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent" + patchShebangs run.sh + wrapQtApp run.sh + xvfb-run -s '-screen 0 800x600x24' ./run.sh popd ''; |