diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-04-21 13:52:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 13:52:35 +0800 |
| commit | c6e39d87d7192f9d0f6be736bb25262d36387e76 (patch) | |
| tree | e0c23fb86c266d45e21a9271b556c00ceb215db9 /pkgs/desktops/deepin | |
| parent | 58473be22effe5ccba21e284dd207ebb7bcaa365 (diff) | |
| parent | 7fd9a81fc6500773a9706834164967d66c2020af (diff) | |
Merge pull request #227000 from wineee/deepin-editor
deepin.deepin-editor: 5.10.35 -> 6.0.7
Diffstat (limited to 'pkgs/desktops/deepin')
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-editor/default.nix | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index b83ee544ab630..8724eec968503 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -1,48 +1,34 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory , cmake , pkg-config , qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins , qtbase , qtsvg -, wrapQtAppsHook +, dde-qt-dbus-factory , kcodecs , syntax-highlighting , libchardet , libuchardet , libiconv -, gtest }: stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "5.10.35"; + version = "6.0.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-X3tsmtqMUSpYQZqCmgtCLCSGwzSmCZagF7TUWQYJsqU="; + sha256 = "sha256-7dHSybjoWZ1alcMsMm4BEEQJjQgNmhC7Eskeo3ZmoS8="; }; - patches = [ - (fetchpatch { - name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; - url = "https://github.com/linuxdeepin/deepin-editor/commit/7f4314f386a3c8f5cdea3618591b8eb027d034c3.patch"; - sha256 = "sha256-/aSBa2nILc/YrFchUyhBHHs2c7Mv6N1juwD5Sdc39Uo="; - }) - ]; - - postPatch = '' - substituteInPlace src/common/utils.h --replace "/usr/share" "$out/share" - ''; - nativeBuildInputs = [ cmake pkg-config @@ -51,18 +37,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase - qtsvg dtkwidget qt5integration qt5platform-plugins + qtbase + qtsvg dde-qt-dbus-factory kcodecs syntax-highlighting libchardet libuchardet libiconv - gtest ]; strictDeps = true; |