From b94f337eee200767632ccfd264a83e6262d8f74f Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 9 Dec 2022 00:43:04 +0100 Subject: [PATCH] hydrus: switch to qt6 --- pkgs/applications/graphics/hydrus/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index bd11b6108b59..60e757d4b55d 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -6,6 +6,8 @@ , enableSwftools ? false , swftools , python3Packages +, qtbase +, qtcharts }: python3Packages.buildPythonPackage rec { @@ -25,6 +27,11 @@ python3Packages.buildPythonPackage rec { python3Packages.mkdocs-material ]; + buildInputs = [ + qtbase + qtcharts + ]; + propagatedBuildInputs = with python3Packages; [ beautifulsoup4 cbor2 @@ -38,7 +45,8 @@ python3Packages.buildPythonPackage rec { pillow psutil pyopenssl - pyside2 + pyqt6 + pyqt6-charts pysocks python-dateutil python3Packages.mpv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7460655d7f4c..f3a23af11bbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29446,7 +29446,7 @@ with pkgs; hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc swftools; - inherit (qt5) wrapQtAppsHook; + inherit (qt6) wrapQtAppsHook qtbase qtcharts; }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {