From 335921e79af7151870edb65c7bad45c102e624a3 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 26 Jul 2024 21:47:46 +0800 Subject: [PATCH] deepin.dtkwidget: 5.6.29 -> 5.6.31 --- .../deepin/library/dtkwidget/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index 923833c808cb..b01049045cb5 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -3,14 +3,9 @@ , fetchFromGitHub , cmake , pkg-config -, qttools , doxygen -, wrapQtAppsHook +, libsForQt5 , dtkgui -, qtbase -, qtmultimedia -, qtsvg -, qtx11extras , cups , gsettings-qt , libstartup_notification @@ -19,13 +14,13 @@ stdenv.mkDerivation rec { pname = "dtkwidget"; - version = "5.6.29"; + version = "5.6.31"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-eFEigOJGw5gTi0G13/rtnqoaeTdnO0aSLfZlRwHg3yE="; + hash = "sha256-FAF66FsmUX0dhFlbT5wAUWkxY0TOU6dcKNwlY10Qou0="; }; patches = [ @@ -41,17 +36,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - qttools doxygen pkg-config - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtmultimedia - qtsvg - qtx11extras + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qtsvg + libsForQt5.qtx11extras cups gsettings-qt libstartup_notification @@ -64,13 +59,13 @@ stdenv.mkDerivation rec { "-DDTK_VERSION=${version}" "-DBUILD_DOCS=ON" "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" ]; preConfigure = '' # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; outputs = [ "out" "dev" "doc" ];