teutat3s
2026-09-16 15:17:24 +02:00
parent a87194e077
commit 6431e4aeb0
2 changed files with 9 additions and 6 deletions

View File

@@ -30,13 +30,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "element-desktop";
version = "1.12.26";
version = "1.12.28";
src = fetchFromGitHub {
owner = "element-hq";
repo = "element-web";
tag = "v${finalAttrs.version}";
hash = "sha256-q9AV/jthbHnbESU/wvjdaCiMnIN6KQgAQ3cvEBvduTw=";
hash = "sha256-goP/f1Go7227R2euXu8aJrwHeUp84DQ+18ztyf4uXhM=";
};
pnpmDeps = fetchPnpmDeps {
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
;
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-R9YuNvrMurRaBxZqUPsUtZSFlSZ8nA7Bd/hlAMfAH+M=";
hash = "sha256-eLTMKzVgP1oSiat80ygWUH2zGF7ukKSLvOEGay/pr9Y=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -94,6 +94,9 @@ stdenv.mkDerivation (finalAttrs: {
export VERSION=${finalAttrs.version}
# Not used here because we link element-web in installPhase, but electron-builder throws an error if it is not present
asar p ${element-web} apps/desktop/webapp.asar
faketty pnpm -C apps/desktop exec nx build:ts
faketty pnpm -C apps/desktop exec nx build:res
pnpm -C apps/desktop exec electron-builder --dir -c.electronDist=electron-dist -c.electronVersion=${electron.version} -c.mac.identity=null

View File

@@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "element-web";
version = "1.12.26";
version = "1.12.28";
src = fetchFromGitHub {
owner = "element-hq";
repo = "element-web";
tag = "v${finalAttrs.version}";
hash = "sha256-q9AV/jthbHnbESU/wvjdaCiMnIN6KQgAQ3cvEBvduTw=";
hash = "sha256-goP/f1Go7227R2euXu8aJrwHeUp84DQ+18ztyf4uXhM=";
};
pnpmDeps = fetchPnpmDeps {
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) version src;
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-R9YuNvrMurRaBxZqUPsUtZSFlSZ8nA7Bd/hlAMfAH+M=";
hash = "sha256-eLTMKzVgP1oSiat80ygWUH2zGF7ukKSLvOEGay/pr9Y=";
};
nativeBuildInputs = [