⬆️ Sable upgrade #15

Merged
wymiller merged 1 commits from sable-upgrade into master 2026-09-07 15:24:05 -05:00
Showing only changes of commit 99fccdc256 - Show all commits
+34 -7
View File
@@ -7,20 +7,34 @@
nodejs_24,
fetchFromGitHub,
}:
buildNpmPackage (finalAttrs:
let
buildNpmPackage (
finalAttrs:
let
pnpm = pnpm_10.override {
nodejs = nodejs_24;
};
in {
matrixrtcSrc = fetchFromGitHub {
owner = "SableClient";
repo = "matrix-rtc";
rev = "519fe6b863cfac78700f4e2b1748649103bb8a8d";
hash = "sha256-n5f7529RdRxY8/a43Xkgrhg4yRz5aNgfoZqWrB7kvak=";
};
livekitMobileSrc = fetchFromGitHub {
owner = "SableClient";
repo = "tauri-plugin-livekit-mobile";
rev = "c6f0d02ab3da1174535bc1dc8e598a2e6873f977";
hash = "sha256-ZPx6Ic+Gkvzg9LXYP9BaQALzOrvLCcQHOms8U3VfnU0=";
};
in
{
pname = "sable-unwrapped";
version = "1.14.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "SableClient";
repo = "Sable";
tag = "v${finalAttrs.version}";
hash = "sha256-zoGKs0pm9m42JrTNAdU33LP139JlVz3RZnkTyY0aiqY=";
hash = "sha256-vYoKNflV4vdJpgYVxYCxAQhvqDh1Qf+7qgIFHxriTTU=";
};
nodejs = nodejs_24;
@@ -33,13 +47,25 @@ in {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-2GwUz0jsuVKQZyeidM0F4rDzijm9AFcAxN7x/m/b3Is=";
hash = "sha256-tzIU/5DQ4SpLABKOt6/Z2aD2d6nVt+MJvY7vHHnO4No=";
};
npmInstallFlags = [
"--ignore-scripts"
];
preBuild = ''
cp -r --no-preserve=mode ${matrixrtcSrc}/. node_modules/@sableclient/matrixrtc/
pnpm exec tsc -p node_modules/@sableclient/matrixrtc/tsconfig.build.json
cp -r --no-preserve=mode ${livekitMobileSrc}/. node_modules/@sableclient/tauri-plugin-livekit-mobile/
pnpm exec tsc \
-p node_modules/@sableclient/tauri-plugin-livekit-mobile/tsconfig.json \
--noEmit false \
--declaration \
--rootDir node_modules/@sableclient/tauri-plugin-livekit-mobile/guest-js \
--outDir node_modules/@sableclient/tauri-plugin-livekit-mobile/dist-js
'';
installPhase = ''
runHook preInstall
@@ -57,4 +83,5 @@ in {
license = lib.licenses.agpl3Only;
platforms = lib.platforms.all;
};
})
}
)