From 6bbb08f744862d21f29dadd2807afff8047e70a6 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 14:30:51 +0800 Subject: [PATCH] deepin.dtkcore: 5.6.3 -> 5.6.10 --- .../deepin/library/dtkcore/default.nix | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix index 282d079570d3..3ca5622d197c 100644 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -1,23 +1,29 @@ { stdenv , lib , fetchFromGitHub -, pkg-config , cmake -, gsettings-qt +, pkg-config +, qttools +, doxygen , wrapQtAppsHook +, qtbase +, gsettings-qt , lshw +, libuchardet , dtkcommon +, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { pname = "dtkcore"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ="; + sha256 = "sha256-ge8DiJMSaZo7GeQEgnDbi5SLsLxtOQ/P5/9aBgaG7Ds="; }; postPatch = '' @@ -28,23 +34,40 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + qttools + doxygen wrapQtAppsHook ]; buildInputs = [ + qtbase gsettings-qt lshw - ]; + libuchardet + ] + ++ lib.optional withSystemd systemd; propagatedBuildInputs = [ dtkcommon ]; cmakeFlags = [ "-DDVERSION=${version}" - "-DBUILD_DOCS=OFF" + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_DOCS=ON" + "-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}" "-DDSG_PREFIX_PATH='/run/current-system/sw'" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" + "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" ]; + 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 tool kit core library"; homepage = "https://github.com/linuxdeepin/dtkcore";