From 90a6b45fdd7270b9c05f45efd02dd20d2563a9d5 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 26 Jul 2024 21:59:46 +0800 Subject: [PATCH] deepin.qt5integration: 5.6.29 -> 5.6.32 --- .../deepin/library/qt5integration/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix index 5fa19075cfaa..41b4c7f9b03d 100644 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -4,9 +4,7 @@ , dtkwidget , cmake , pkg-config -, qtbase -, qtsvg -, qtx11extras +, libsForQt5 , lxqt , mtdev , xorg @@ -15,13 +13,13 @@ stdenv.mkDerivation rec { pname = "qt5integration"; - version = "5.6.29"; + version = "5.6.32"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-yFY+bsvmVo92u6eLw9VYGAz5nehVrFob4AkdyG0nvjM="; + hash = "sha256-WRMeH66X21Z6TBKPEabnWqzC95+OR9M5azxvAp6K7T4="; }; nativeBuildInputs = [ @@ -31,9 +29,9 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget - qtbase - qtsvg - qtx11extras + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qtx11extras mtdev lxqt.libqtxdg_3_12 xorg.xcbutilrenderutil @@ -41,7 +39,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" + "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}" ]; dontWrapQtApps = true;