element-{web,desktop}: 1.12.14 -> 1.12.18 (#517294)

This commit is contained in:
Sandro
2026-05-17 19:44:05 +00:00
committed by GitHub
2 changed files with 12 additions and 8 deletions
+9 -5
View File
@@ -16,6 +16,7 @@
fetchPnpmDeps,
pnpmConfigHook,
pnpm_10,
faketty,
asar,
copyDesktopItems,
darwin,
@@ -29,13 +30,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "element-desktop";
version = "1.12.14";
version = "1.12.18";
src = fetchFromGitHub {
owner = "element-hq";
repo = "element-web";
tag = "v${finalAttrs.version}";
hash = "sha256-yy7CfMOMT1DBXHDHaDyAaOgp3s2KQIKA1A6zUhVOUhM=";
hash = "sha256-G2HEOv1fHVgbT79bo8ibp9VmtQ8o5vA6/i6Q5TUKqdw=";
};
pnpmDeps = fetchPnpmDeps {
@@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk=";
hash = "sha256-0iGzjwT+99tvRuxYD+1+SrYrCYAI1dcjhXT3x6E/wHg=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpm
pnpmConfigHook
tsx
faketty
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.autoSignDarwinBinariesHook
@@ -85,13 +87,15 @@ stdenv.mkDerivation (finalAttrs: {
cd ../../
'';
# faketty is required to work around a bug in nx.
# See: https://github.com/nrwl/nx/issues/22445
buildPhase = ''
runHook preBuild
export VERSION=${finalAttrs.version}
pnpm -C apps/desktop run build:ts
pnpm -C apps/desktop run build:res
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
cd apps/desktop
@@ -26,13 +26,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "element-web";
version = "1.12.14";
version = "1.12.18";
src = fetchFromGitHub {
owner = "element-hq";
repo = "element-web";
tag = "v${finalAttrs.version}";
hash = "sha256-yy7CfMOMT1DBXHDHaDyAaOgp3s2KQIKA1A6zUhVOUhM=";
hash = "sha256-G2HEOv1fHVgbT79bo8ibp9VmtQ8o5vA6/i6Q5TUKqdw=";
};
pnpmDeps = fetchPnpmDeps {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) version src;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk=";
hash = "sha256-0iGzjwT+99tvRuxYD+1+SrYrCYAI1dcjhXT3x6E/wHg=";
};
nativeBuildInputs = [