From 8f7d0e6ab29fb4acd2474ab5eaf3017952b0e3ea Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 14:37:01 +0800 Subject: [PATCH] deepin.dtkgui: 5.6.3 -> 5.6.10 --- .../deepin/library/dtkgui/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index b408055b0c37..5112feffd9ec 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -4,36 +4,42 @@ , pkg-config , cmake , qttools +, doxygen , wrapQtAppsHook -, librsvg -, lxqt +, qtbase , dtkcore , qtimageformats +, lxqt +, librsvg , freeimage +, libraw }: stdenv.mkDerivation rec { pname = "dtkgui"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4="; + sha256 = "sha256-4NHt/hLtt99LhWvBX9e5ueB5G86SXx553G6fyHZBXcE="; }; nativeBuildInputs = [ cmake qttools + doxygen pkg-config wrapQtAppsHook ]; buildInputs = [ + qtbase lxqt.libqtxdg librsvg freeimage + libraw ]; propagatedBuildInputs = [ @@ -43,10 +49,19 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDVERSION=${version}" - "-DBUILD_DOCS=OFF" + "-DBUILD_DOCS=ON" + "-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + 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} + ''; + meta = with lib; { description = "Deepin Toolkit, gui module for DDE look and feel"; homepage = "https://github.com/linuxdeepin/dtkgui";