diff options
Diffstat (limited to 'pkgs/desktops/deepin')
8 files changed, 79 insertions, 25 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index 2a499b4288986..c3ff184d91977 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "deepin-system-monitor"; - version = "5.9.32"; + version = "5.9.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-jze5Pigk4edjojmpNNwaVVfcpk5Aed/S0y9YE0HdC0A"; + sha256 = "sha256-X7/YwnJyA/HOLsOGARjsHWgL2qxW1eU1TvoWulvz0j4="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-launcher/default.nix b/pkgs/desktops/deepin/core/dde-launcher/default.nix index cd73cf8dc7e0b..7d850c544d536 100644 --- a/pkgs/desktops/deepin/core/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/core/dde-launcher/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { }; postPatch = '' + #fix build with new dtk(https://github.com/linuxdeepin/dde-launcher/pull/369) + substituteInPlace src/windowedframe.h \ + --replace "#include <dregionmonitor.h>" " " substituteInPlace src/boxframe/{backgroundmanager.cpp,boxframe.cpp} \ --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" substituteInPlace dde-launcher.desktop dde-launcher-wapper src/dbusservices/com.deepin.dde.Launcher.service \ diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix index 24e22e99c5024..a0845277355e5 100644 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dtkcommon"; - version = "5.6.3"; + version = "5.6.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM="; + sha256 = "sha256-FHXwgFTevCGTNUPlb/oeltE2//Sjwz7YVvko7QPOsRo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix index 282d079570d36..3ca5622d197c4 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"; diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index b408055b0c37e..5112feffd9ec4 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"; diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index 170ae821eba2a..65c556d77b74b 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -1,14 +1,16 @@ { stdenv , lib , fetchFromGitHub -, dtkgui -, pkg-config , cmake +, pkg-config , qttools +, doxygen +, wrapQtAppsHook +, dtkgui +, qtbase , qtmultimedia , qtsvg , qtx11extras -, wrapQtAppsHook , cups , gsettings-qt , libstartup_notification @@ -17,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dtkwidget"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU="; + sha256 = "sha256-PhVK/lUFrDW1bn9lUhLuKWLAVj7E7+/YC5USShrg3ds="; }; postPatch = '' @@ -35,11 +37,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools + doxygen pkg-config wrapQtAppsHook ]; buildInputs = [ + qtbase qtmultimedia qtsvg qtx11extras @@ -53,10 +57,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 graphical user interface library"; homepage = "https://github.com/linuxdeepin/dtkwidget"; diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix index b3e5a189135cd..426cb091a32c0 100644 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qt5integration"; - version = "5.6.4"; + version = "5.6.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-MZkhTvjTyBrlntgFq2F3iGK7WvfmnGJQLk5B1OM5kQo="; + sha256 = "sha256-7b18ydyy/TIEGDkFAoium1LSx3Qs4I4pYpMfehOBZbY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 272a7b9d87007..1255bdb1534af 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qt5platform-plugins"; - version = "5.6.5"; + version = "5.6.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-DHgnfJTUw1hY53DmDfzVFM6Ff8q6pbNDPmPeSsV7MwY="; + sha256 = "sha256-EG5M4rcMK62DX4ywm2IH0lGHC510BnMqcefMlF9pyr8="; }; nativeBuildInputs = [ |