diff options
Diffstat (limited to 'pkgs/desktops')
12 files changed, 62 insertions, 96 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 9af8a60088d6e..096a353224d4e 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -4,48 +4,43 @@ fetchFromGitHub, cmake, pkg-config, - qttools, - wrapQtAppsHook, dtkwidget, qt5integration, qt5platform-plugins, - qtbase, - qtsvg, dde-qt-dbus-factory, - kcodecs, - syntax-highlighting, libchardet, libuchardet, libiconv, + libsForQt5, }: stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "6.5.0"; + version = "6.5.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-f6CJlSgsKU311ziXmm7Ado8tH+3dNRpWB1e4TewVf/8="; + hash = "sha256-Z3fsnjo4Pcu1e8lKvWdWBhpoOFFy0dSrI2HehRYKJ0k="; }; nativeBuildInputs = [ cmake pkg-config - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ dtkwidget qt5integration qt5platform-plugins - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg dde-qt-dbus-factory - kcodecs - syntax-highlighting + libsForQt5.kcodecs + libsForQt5.syntax-highlighting libchardet libuchardet libiconv diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix index a3a3b52c23891..6600df5b79640 100644 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -4,35 +4,28 @@ fetchFromGitHub, cmake, pkg-config, - qttools, doxygen, - wrapQtAppsHook, - wrapGAppsHook3, wayland-scanner, + wayland, dtkwidget, qt5integration, qt5platform-plugins, + libsForQt5, deepin-pw-check, - qtbase, - qtx11extras, - qtmultimedia, - polkit-qt, libxcrypt, - librsvg, gtest, runtimeShell, - dbus, }: stdenv.mkDerivation rec { pname = "dde-control-center"; - version = "6.0.59"; + version = "6.0.65"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-OniY/B/9319AYYFFPnsUMNrnc0yVGG3rfCLPjgNFyag="; + hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0="; }; postPatch = '' @@ -43,24 +36,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qttools + libsForQt5.qttools doxygen - wrapQtAppsHook - wrapGAppsHook3 + libsForQt5.wrapQtAppsHook wayland-scanner ]; - dontWrapGApps = true; buildInputs = [ + wayland dtkwidget qt5platform-plugins + qt5integration deepin-pw-check - qtbase - qtx11extras - qtmultimedia - polkit-qt + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.polkit-qt libxcrypt - librsvg gtest ]; @@ -79,17 +70,7 @@ stdenv.mkDerivation rec { 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} - ''; - - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}" - ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; outputs = [ @@ -97,12 +78,12 @@ stdenv.mkDerivation rec { "dev" ]; - meta = with lib; { + meta = { description = "Control panel of Deepin Desktop Environment"; mainProgram = "dde-control-center"; homepage = "https://github.com/linuxdeepin/dde-control-center"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index 44d46a0c9fae0..1a7b2cb5107c1 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "0.8.4"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-MPOzKAgwhJa7pMO6EZ6vYyYgZSD/SbU/L0L1dkN9/po="; + hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM="; }; nativeBuildInputs = [ @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - meta = with lib; { + meta = { description = "'launcher' or 'start menu' component for DDE"; mainProgram = "dde-launchpad"; homepage = "https://github.com/linuxdeepin/dde-launchpad"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix index 422b239edf184..9d5272df72663 100644 --- a/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -3,44 +3,40 @@ lib, fetchFromGitHub, cmake, - qttools, pkg-config, - wrapQtAppsHook, - qtbase, - qtsvg, dtkwidget, dde-control-center, dde-session-shell, - networkmanager-qt, + libsForQt5, glib, gtest, }: stdenv.mkDerivation rec { pname = "dde-network-core"; - version = "2.0.32"; + version = "2.0.34"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-dXLvBCNitlV07dH/rPatsbP6DFf8SZQ7hcDUYtqt2FA="; + hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI="; }; nativeBuildInputs = [ cmake - qttools + libsForQt5.qttools pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg dtkwidget dde-control-center dde-session-shell - networkmanager-qt + libsForQt5.networkmanager-qt glib gtest ]; @@ -49,11 +45,11 @@ stdenv.mkDerivation rec { strictDeps = true; - meta = with lib; { + meta = { description = "DDE network library framework"; homepage = "https://github.com/linuxdeepin/dde-network-core"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix index 4f4a3f0f71e68..a27406db98928 100644 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, extra-cmake-modules, pkg-config, @@ -23,22 +22,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-shell"; - version = "0.0.43"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-shell"; rev = finalAttrs.version; - hash = "sha256-wSk1gEJbTxKUPZ6DiTeVw2qyX+CwANA37ZP0tXnz0J0="; + hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo="; }; patches = [ ./fix-path-for-nixos.diff - (fetchpatch { - name = "fix-libdock-plugin_so-contains-a-forbidden-reference.diff"; - url = "https://github.com/linuxdeepin/dde-shell/commit/bf9a0472bc44748a3c389d796d144dad6b13617b.patch"; - hash = "sha256-cP5zMsfPyi4FIR1OIbVSnn+Z+KqRuIK7a214VjVb/7w="; - }) ]; postPatch = '' diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix index c1e2fde90e852..06d76e0398fd2 100644 --- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix +++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix @@ -18,20 +18,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-tray-loader"; - version = "0.0.11"; + version = "1.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-tray-loader"; rev = finalAttrs.version; - hash = "sha256-kz8+essf6O3ckeY5/5a/Z6539qNcfOnGbGTqSo5swhc="; + hash = "sha256-FEvoVgwzDYN23TJxu1kRSMSbS4hELYFFByxOsEO9JKE="; }; patches = [ (fetchpatch { - name = "set-version-for-dde-dock_pc.patch"; - url = "https://github.com/linuxdeepin/dde-tray-loader/commit/0f9b90a9aa8096a92c21c8f01d29b4785aaf04e5.patch"; - hash = "sha256-A6k8XjyIDbA+XuUxYWd5yxFJ8yOWMOtUH5Vg10o//YM="; + name = "remove-useless-function.patch"; + url = "https://github.com/linuxdeepin/dde-tray-loader/commit/cf85f68db52472a0291bbbc3c298d7a2b701e4bc.patch"; + hash = "sha256-ks7Rg5kLQvo03XKbfQaqu/heP2yoVEbNO6UhDv99JBY="; }) ]; diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index 31bf59583c047..2e8b53dfa7f67 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6core"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6core"; rev = finalAttrs.version; - hash = "sha256-zyhqkxxWB5U37eBxINNxcbnF5NpImg+E7H1VhfJDz60="; + hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix index 83d3140db7e48..ed54eb321cab6 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6declarative"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6declarative"; rev = finalAttrs.version; - hash = "sha256-/bQGb87UbnIRWwR6Of67VrRUkrNk6dmY7bjgwDXc30Y"; + hash = "sha256-BxWPLJeuQDbNg4UoyHD/VAMV2QFWDjWZiFx5JOEmLxg="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 524a4bbb1c288..e6dddb93587f8 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6gui"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6gui"; rev = finalAttrs.version; - hash = "sha256-w8tyc06v/juTP0YSsyWai1ONl4Aa7dzREIc5wLnI/vw="; + hash = "sha256-nqwkBMcCQiW4iqYhceTaSNNxoR5tvCNfjKUVVHkzN3A="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix index 7e47a4c92ca6a..b76a189b271fe 100644 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtk6widget"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dtk6widget"; rev = finalAttrs.version; - hash = "sha256-6H3Dtdyq/adb3jz9lGaKmOguXqvhvZn1/G7+YajyF2k="; + hash = "sha256-VlFzecX76RMNSBpnMc9HwMPZ5z3zzzkcVcNlGKSShyA="; }; patches = [ diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix index 07b93c85f74cb..19f6d5f936693 100644 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "qt6integration"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7FGOnAAcwOonpMDDukj88s1b4WmLJNu7MZSW7f7P44g="; + hash = "sha256-RVhAuEthrTE1QkRIKmBK4VM86frgAqLMJL31F11H8R8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 84eff44d2330b..93ac45236ba9e 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qt6platform-plugins"; - version = "6.0.18"; + version = "6.0.19"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-O2wylkNKqN0JxKffwFNSfv7S1hPIFrVKwSsppSGTp6I="; + hash = "sha256-aHqm+WKZLoUymiMFfrF3jgWrxgq51d6yTXWiOMsFgiQ="; }; postUnpack = '' |