diff options
Diffstat (limited to 'pkgs/desktops/deepin')
26 files changed, 38 insertions, 35 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix index 0e53897b47731..4cca3377492c7 100644 --- a/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; meta = with lib; { - description = "A fashion photo manager for viewing and organizing pictures"; + description = "Fashion photo manager for viewing and organizing pictures"; homepage = "https://github.com/linuxdeepin/deepin-album"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix index fa5c80d4a0719..6565e99401ce8 100644 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; meta = with lib; { - description = "An easy to use calculator for ordinary users"; + description = "Easy to use calculator for ordinary users"; mainProgram = "deepin-calculator"; homepage = "https://github.com/linuxdeepin/deepin-calculator"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 8943b84231744..07a92200cb21a 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = with lib; { - description = "A fast and lightweight application for creating and extracting archives"; + description = "Fast and lightweight application for creating and extracting archives"; mainProgram = "deepin-compressor"; homepage = "https://github.com/linuxdeepin/deepin-compressor"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index c0cfc4465e1a8..7987c814b7aa8 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - description = "A desktop text editor that supports common text editing features"; + description = "Desktop text editor that supports common text editing features"; homepage = "https://github.com/linuxdeepin/deepin-editor"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index 7d7df4494a3a2..8cb889b05f448 100644 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; meta = with lib; { - description = "An image viewing tool with fashion interface and smooth performance"; + description = "Image viewing tool with fashion interface and smooth performance"; homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index d9f810c951846..003e46a3817b0 100644 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -1,11 +1,9 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , wrapQtAppsHook -, qtbase , qttools , qtx11extras , qtmultimedia @@ -30,7 +28,6 @@ , gst_all_1 , gtest , libpulseaudio -, runtimeShell }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index 39045e0e2a614..d730114af4fcf 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A simple memo software with texts and voice recordings"; + description = "Simple memo software with texts and voice recordings"; mainProgram = "deepin-reader"; homepage = "https://github.com/linuxdeepin/deepin-reader"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix index daadb5a863d35..5de3bb6f845e5 100644 --- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A screensaver service developed by deepin"; + description = "Screensaver service developed by deepin"; mainProgram = "deepin-screensaver"; homepage = "https://github.com/linuxdeepin/deepin-screensaver"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index 52492275e98cd..d4aebc807fb41 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = with lib; { - description = "A more user-friendly system monitor"; + description = "More user-friendly system monitor"; homepage = "https://github.com/linuxdeepin/deepin-system-monitor"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix index f311339b6be01..f779a77c3234d 100644 --- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { - description = "The freedesktop sound theme for Deepin"; + description = "Freedesktop sound theme for Deepin"; homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix index 01fd610099c7f..74f6ba76e848c 100644 --- a/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A program used to set the theme and appearance of deepin desktop"; + description = "Program used to set the theme and appearance of deepin desktop"; homepage = "https://github.com/linuxdeepin/dde-appearance"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix index 275d8e5894927..7e05e41315ba5 100644 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ b/pkgs/desktops/deepin/core/dde-dock/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchFromGitHub , cmake , extra-cmake-modules diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index 3e3b15f3a250f..f531418750d4b 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "The 'launcher' or 'start menu' component for DDE"; + description = "'launcher' or 'start menu' component for DDE"; mainProgram = "dde-launchpad"; homepage = "https://github.com/linuxdeepin/dde-launchpad"; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index 4a63b779c4c5d..14fe7c03c3e38 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -64,23 +64,26 @@ buildGoModule rec { postPatch = '' substituteInPlace session/eventlog/{app_event.go,login_event.go} \ - --replace "/bin/bash" "${runtimeShell}" + --replace-fail "/bin/bash" "${runtimeShell}" substituteInPlace inputdevices/layout_list.go \ - --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + --replace-fail "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" - substituteInPlace bin/dde-system-daemon/wallpaper.go accounts1/user.go \ - --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" + substituteInPlace accounts1/user.go \ + --replace-fail "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" substituteInPlace timedate1/zoneinfo/zone.go \ - --replace "/usr/share/dde" "$out/share/dde" \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + --replace-fail "/usr/share/dde" "$out/share/dde" \ + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \ - --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" + --replace-fail "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" substituteInPlace accounts1/user_chpwd_union_id.go \ - --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + --replace-fail "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + + substituteInPlace system/uadp1/crypto.go \ + --replace-fail "/usr/share/uadp" "/var/lib/dde-daemon/uadp" for file in $(grep "/usr/lib/deepin-daemon" * -nR |awk -F: '{print $1}') do diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix index d01c45c654d21..fd50f71ac2013 100644 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -41,9 +41,9 @@ buildGoModule rec { ]; postPatch = '' - sed -i 's|iniparser/||' */*.c + sed -i '1i#include <stdlib.h>\n#include <string.h>' tool/pwd_conf_update.c substituteInPlace misc/{pkgconfig/libdeepin_pw_check.pc,system-services/org.deepin.dde.PasswdConf1.service} \ - --replace "/usr" "$out" + --replace-fail "/usr" "$out" ''; buildPhase = '' diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix index 3f65505e0af55..908f328db9ff1 100644 --- a/pkgs/desktops/deepin/library/disomaster/default.nix +++ b/pkgs/desktops/deepin/library/disomaster/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; meta = with lib; { - description = "A libisoburn wrapper class for Qt"; + description = "Libisoburn wrapper class for Qt"; homepage = "https://github.com/linuxdeepin/disomaster"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix index 8605a0d214b74..41b9a8ee7ce39 100644 --- a/pkgs/desktops/deepin/library/docparser/default.nix +++ b/pkgs/desktops/deepin/library/docparser/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; meta = with lib; { - description = "A document parser library ported from document2html"; + description = "Document parser library ported from document2html"; homepage = "https://github.com/linuxdeepin/docparser"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index d86bebdea1d83..8acd1aa986868 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , pkg-config , doxygen @@ -27,6 +28,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-pkgconfig-path.patch ./fix-pri-path.patch + (fetchpatch { + name = "fix-build-on-qt-6_7_1.patch"; + url = "https://github.com/linuxdeepin/dtkcore/commit/10bd3842bbde41fbc61c35b81d280075d053119b.patch"; + hash = "sha256-xZ3BhiMB6S5NJtPUEjtChCB9Jr1BI0mu7AMjyNMqt9w="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix index ecafebf66b71d..c3ae917a66254 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "doc" ]; meta = { - description = "A widget development toolkit based on QtQuick/QtQml"; + description = "Widget development toolkit based on QtQuick/QtQml"; mainProgram = "dtk-exhibition"; homepage = "https://github.com/linuxdeepin/dtk6declarative"; license = lib.licenses.lgpl3Plus; diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix index d9f400ce979fb..f6b185582031b 100644 --- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix +++ b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , doxygen diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix index 1a55d6855ec93..a2abd17c98274 100644 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - description = "A public project for building DTK Library"; + description = "Public project for building DTK Library"; homepage = "https://github.com/linuxdeepin/dtkcommon"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix index 32e499ad242ac..00c884e6468b0 100644 --- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix +++ b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; meta = with lib; { - description = "A widget development toolkit based on QtQuick/QtQml"; + description = "Widget development toolkit based on QtQuick/QtQml"; mainProgram = "dtk-exhibition"; homepage = "https://github.com/linuxdeepin/dtkdeclarative"; license = licenses.lgpl3Plus; diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index 59c1ae7be8560..51130710af466 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , qttools diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix index e7576f7169f86..e726b0af73b6d 100644 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ b/pkgs/desktops/deepin/library/util-dfm/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A Toolkits of libdfm-io,libdfm-mount and libdfm-burn"; + description = "Toolkits of libdfm-io,libdfm-mount and libdfm-burn"; homepage = "https://github.com/linuxdeepin/util-dfm"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix index 7eaca5768607a..2d3c5a020884f 100644 --- a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A daemon that helps to launch dtk applications faster"; + description = "Daemon that helps to launch dtk applications faster"; homepage = "https://github.com/linuxdeepin/deepin-turbo"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix index f090c6feefa84..730d17404f3f6 100644 --- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix +++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A simple graphical interface for creating file system in a block device"; + description = "Simple graphical interface for creating file system in a block device"; mainProgram = "dde-device-formatter"; homepage = "https://github.com/linuxdeepin/dde-device-formatter"; license = licenses.gpl3Plus; |