From daaeae00fe40d45205da7ba817b6749d03b8aef0 Mon Sep 17 00:00:00 2001
From: Youwes09 <yuvi.shen@outlook.com>
Date: Thu, 30 Apr 2026 01:19:55 -0500
Subject: [PATCH] Fix: Patch Flake & PKGBUILD for Preview

---
 PKGBUILD         | 14 +++++++-------
 flake.nix        |  1 +
 nix/frontend.nix |  4 ++--
 nix/moku.nix     |  7 ++++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index c99c64d..ec6db83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,11 +19,11 @@ makedepends=(
 )
 source=(
     "$pkgname-$pkgver.tar.gz::https://github.com/moku-project/Moku/archive/refs/tags/v$pkgver.tar.gz"
-    "Suwayomi-Server-v2.1.1867.jar::https://github.com/Suwayomi/Suwayomi-Server/releases/download/v2.1.1867/Suwayomi-Server-v2.1.1867.jar"
+    "Suwayomi-Server-v2.1.2087.jar::https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087.jar"
 )
 sha256sums=(
     '4d0fbed929d5660ddcb591ff33f808910e13df1e8e7bfc8df83f367fd7bcd881'
-    '51e307c2581e4e1a002991ab3e3a77503c8b074c42695987a984a7382d0ac5af'
+    'f589a422674252394c13b289a9c8be691905bf583efb7f4d5f1501ae5e91e6b3'
 )
 
 prepare() {
@@ -45,11 +45,11 @@ package() {
     install -Dm755 src-tauri/target/release/moku \
         "$pkgdir/usr/bin/moku"
 
-    install -Dm644 "$srcdir/Suwayomi-Server-v2.1.1867.jar" \
+    install -Dm644 "$srcdir/Suwayomi-Server-v2.1.2087.jar" \
         "$pkgdir/usr/lib/moku/tachidesk/Suwayomi-Server.jar"
 
     install -dm755 "$pkgdir/usr/lib/moku/tachidesk/default-conf"
-    cat > "$pkgdir/usr/lib/moku/tachidesk/default-conf/server.conf" << 'EOF'
+    cat > "$pkgdir/usr/lib/moku/tachidesk/default-conf/server.conf" << 'CONF'
 server.ip = "127.0.0.1"
 server.port = 4567
 server.webUIEnabled = false
@@ -60,9 +60,9 @@ server.autoDownloadNewChapters = false
 server.globalUpdateInterval = 12
 server.maxSourcesInParallel = 6
 server.extensionRepos = []
-EOF
+CONF
 
-    install -Dm755 /dev/stdin "$pkgdir/usr/bin/moku-suwayomi" << 'EOF'
+    install -Dm755 /dev/stdin "$pkgdir/usr/bin/moku-suwayomi" << 'LAUNCHER'
 #!/bin/sh
 DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/Tachidesk"
 mkdir -p "$DATA_DIR"
@@ -93,7 +93,7 @@ exec java \
   -Dsun.awt.disablegui=true \
   -Dsuwayomi.tachidesk.config.server.rootDir="$DATA_DIR" \
   -jar /usr/lib/moku/tachidesk/Suwayomi-Server.jar
-EOF
+LAUNCHER
 
     install -Dm644 packaging/io.github.moku_project.Moku.desktop \
         "$pkgdir/usr/share/applications/io.github.moku_project.Moku.desktop"
diff --git a/flake.nix b/flake.nix
index e860c02..3744374 100644
--- a/flake.nix
+++ b/flake.nix
@@ -91,6 +91,7 @@
 
           moku = import ./nix/moku.nix {
             inherit lib craneLib pkgs runtimeLibs frontend suwayomiServer version cargoSrc;
+            appIcon = ./src/assets/moku-icon.svg;
           };
 
           # ── dev/release scripts ─────────────────────────────────────────
diff --git a/nix/frontend.nix b/nix/frontend.nix
index 8d7aef8..c59a21e 100644
--- a/nix/frontend.nix
+++ b/nix/frontend.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, nodejs_22, pnpm, pnpmConfigHook, version, src }:
+{ lib, stdenv, nodejs_22, pnpm, pnpmConfigHook, fetchPnpmDeps, version, src }:
 
 stdenv.mkDerivation {
   pname = "moku-frontend";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ nodejs_22 pnpm pnpmConfigHook ];
 
-  pnpmDeps = pnpm.fetchDeps {
+  pnpmDeps = fetchPnpmDeps {
     pname = "moku-frontend";
     inherit version src;
     fetcherVersion = 1;
diff --git a/nix/moku.nix b/nix/moku.nix
index 7f14ec2..aae0aab 100644
--- a/nix/moku.nix
+++ b/nix/moku.nix
@@ -7,13 +7,14 @@
   suwayomiServer,
   version,
   cargoSrc,
+  appIcon,
 }:
 
 let
   commonArgs = {
     src = cargoSrc;
-    cargoToml = ./src-tauri/Cargo.toml;
-    cargoLock = ./src-tauri/Cargo.lock;
+    pname = "moku";
+    inherit version;
     strictDeps = true;
     buildInputs = runtimeLibs;
     nativeBuildInputs = with pkgs; [ pkg-config wrapGAppsHook3 ];
@@ -57,7 +58,7 @@ EOF
         "$out/share/icons/hicolor/''${size}@2/apps/moku.png"
     done
 
-    install -Dm644 "${./src/assets/moku-icon.svg}" \
+    install -Dm644 "${appIcon}" \
       "$out/share/icons/hicolor/scalable/apps/moku.svg"
 
     wrapProgram $out/bin/moku \