From 521f3ab28ceb4f2a0219024be1d03799d8f104c1 Mon Sep 17 00:00:00 2001
From: shenleban tongying <shenlebantongying@gmail.com>
Date: Wed, 2 Aug 2023 13:25:00 -0400
Subject: [PATCH 1/2] maintainers: add slbtty

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0fd3bf287ec8f6b..237dc3816ab9a5e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15347,6 +15347,12 @@
     githubId = 3789764;
     name = "skykanin";
   };
+  slbtty = {
+    email = "shenlebantongying@gmail.com";
+    github = "shenlebantongying";
+    githubId = 20123683;
+    name = "Shenleban Tongying";
+  };
   sleexyz = {
     email = "freshdried@gmail.com";
     github = "sleexyz";

From 4412cff10a28795565fcbf4d3edd9a6fa02bee54 Mon Sep 17 00:00:00 2001
From: shenleban tongying <shenlebantongying@gmail.com>
Date: Wed, 2 Aug 2023 13:25:18 -0400
Subject: [PATCH 2/2] goldendict-ng: init at 23.07.23

---
 .../misc/goldendict-ng/default.nix            | 83 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/applications/misc/goldendict-ng/default.nix

diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix
new file mode 100644
index 000000000000000..983b61b9317c686
--- /dev/null
+++ b/pkgs/applications/misc/goldendict-ng/default.nix
@@ -0,0 +1,83 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, cmake
+, libvorbis
+, ffmpeg
+, libeb
+, hunspell
+, opencc
+, xapian
+, libzim
+, lzo
+, xz
+, tomlplusplus
+, fmt
+, bzip2
+, libiconv
+, libXtst
+, qtbase
+, qtsvg
+, qtwebengine
+, qttools
+, qtwayland
+, qt5compat
+, qtmultimedia
+, qtspeech
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "goldendict-ng";
+  version = "23.07.23";
+
+  src = fetchFromGitHub {
+    owner = "xiaoyifang";
+    repo = "goldendict-ng";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ZKbrO5L4KFmr2NsGDihRWBeW0OXHoPRwZGj6kt1Anc8=";
+  };
+
+  nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
+  buildInputs = [
+    qtbase
+    qtsvg
+    qttools
+    qtwebengine
+    qt5compat
+    qtmultimedia
+    qtspeech
+    libvorbis
+    tomlplusplus
+    fmt
+    hunspell
+    xz
+    lzo
+    libXtst
+    bzip2
+    libiconv
+    opencc
+    libeb
+    ffmpeg
+    xapian
+    libzim
+  ];
+
+  cmakeFlags = [
+    "-DWITH_XAPIAN=ON"
+    "-DWITH_ZIM=ON"
+    "-DWITH_FFMPEG_PLAYER=ON"
+    "-DWITH_EPWING_SUPPORT=ON"
+    "-DUSE_SYSTEM_FMT=ON"
+    "-DUSE_SYSTEM_TOML=ON"
+  ];
+
+  meta = with lib; {
+    homepage = "https://xiaoyifang.github.io/goldendict-ng/";
+    description = "Advanced multi-dictionary lookup program.";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ slbtty ];
+    license = licenses.gpl3Plus;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79c184430b18727..3ca0c872d5ec29f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31305,6 +31305,7 @@ with pkgs;
   };
 
   goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
+  goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };
 
   gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };