gamezonline/Moku
1
0
Fork 0
mirror of https://github.com/moku-project/Moku.git synced 2026-06-13 01:09:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Patch Flake & PKGBUILD for Preview

Browse Source
This commit is contained in:
Youwes09
2026-04-30 01:19:55 -05:00
parent 79cb2f7c56
commit daaeae00fe
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PKGBUILD
+7 -7
View File
@@ -19,11 +19,11 @@ makedepends=(
) )
source=( source=(
"$pkgname-$pkgver.tar.gz::https://github.com/moku-project/Moku/archive/refs/tags/v$pkgver.tar.gz" "$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=( sha256sums=(
'4d0fbed929d5660ddcb591ff33f808910e13df1e8e7bfc8df83f367fd7bcd881' '4d0fbed929d5660ddcb591ff33f808910e13df1e8e7bfc8df83f367fd7bcd881'
'51e307c2581e4e1a002991ab3e3a77503c8b074c42695987a984a7382d0ac5af' 'f589a422674252394c13b289a9c8be691905bf583efb7f4d5f1501ae5e91e6b3'
) )
prepare() { prepare() {
@@ -45,11 +45,11 @@ package() {
install -Dm755 src-tauri/target/release/moku \ install -Dm755 src-tauri/target/release/moku \
"$pkgdir/usr/bin/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" "$pkgdir/usr/lib/moku/tachidesk/Suwayomi-Server.jar"
install -dm755 "$pkgdir/usr/lib/moku/tachidesk/default-conf" 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.ip = "127.0.0.1"
server.port = 4567 server.port = 4567
server.webUIEnabled = false server.webUIEnabled = false
@@ -60,9 +60,9 @@ server.autoDownloadNewChapters = false
server.globalUpdateInterval = 12 server.globalUpdateInterval = 12
server.maxSourcesInParallel = 6 server.maxSourcesInParallel = 6
server.extensionRepos = [] 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 #!/bin/sh
DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/Tachidesk" DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/Tachidesk"
mkdir -p "$DATA_DIR" mkdir -p "$DATA_DIR"
@@ -93,7 +93,7 @@ exec java \
-Dsun.awt.disablegui=true \ -Dsun.awt.disablegui=true \
-Dsuwayomi.tachidesk.config.server.rootDir="$DATA_DIR" \ -Dsuwayomi.tachidesk.config.server.rootDir="$DATA_DIR" \
-jar /usr/lib/moku/tachidesk/Suwayomi-Server.jar -jar /usr/lib/moku/tachidesk/Suwayomi-Server.jar
EOF LAUNCHER
install -Dm644 packaging/io.github.moku_project.Moku.desktop \ install -Dm644 packaging/io.github.moku_project.Moku.desktop \
"$pkgdir/usr/share/applications/io.github.moku_project.Moku.desktop" "$pkgdir/usr/share/applications/io.github.moku_project.Moku.desktop"
flake.nix
+1
View File
@@ -91,6 +91,7 @@
moku = import ./nix/moku.nix { moku = import ./nix/moku.nix {
inherit lib craneLib pkgs runtimeLibs frontend suwayomiServer version cargoSrc; inherit lib craneLib pkgs runtimeLibs frontend suwayomiServer version cargoSrc;
appIcon = ./src/assets/moku-icon.svg;
}; };
# ── dev/release scripts ───────────────────────────────────────── # ── dev/release scripts ─────────────────────────────────────────
nix/frontend.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, nodejs_22, pnpm, pnpmConfigHook, version, src }: { lib, stdenv, nodejs_22, pnpm, pnpmConfigHook, fetchPnpmDeps, version, src }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "moku-frontend"; pname = "moku-frontend";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nodejs_22 pnpm pnpmConfigHook ]; nativeBuildInputs = [ nodejs_22 pnpm pnpmConfigHook ];
pnpmDeps = pnpm.fetchDeps { pnpmDeps = fetchPnpmDeps {
pname = "moku-frontend"; pname = "moku-frontend";
inherit version src; inherit version src;
fetcherVersion = 1; fetcherVersion = 1;
nix/moku.nix
+4 -3
View File
@@ -7,13 +7,14 @@
suwayomiServer, suwayomiServer,
version, version,
cargoSrc, cargoSrc,
appIcon,
}: }:
let let
commonArgs = { commonArgs = {
src = cargoSrc; src = cargoSrc;
cargoToml = ./src-tauri/Cargo.toml; pname = "moku";
cargoLock = ./src-tauri/Cargo.lock; inherit version;
strictDeps = true; strictDeps = true;
buildInputs = runtimeLibs; buildInputs = runtimeLibs;
nativeBuildInputs = with pkgs; [ pkg-config wrapGAppsHook3 ]; nativeBuildInputs = with pkgs; [ pkg-config wrapGAppsHook3 ];
@@ -57,7 +58,7 @@ EOF
"$out/share/icons/hicolor/''${size}@2/apps/moku.png" "$out/share/icons/hicolor/''${size}@2/apps/moku.png"
done done
install -Dm644 "${./src/assets/moku-icon.svg}" \ install -Dm644 "${appIcon}" \
"$out/share/icons/hicolor/scalable/apps/moku.svg" "$out/share/icons/hicolor/scalable/apps/moku.svg"
wrapProgram $out/bin/moku \ wrapProgram $out/bin/moku \