From 0c4233670ec29c93b58aabaaefe5357c8ccba9ee Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 23 Sep 2025 18:31:08 +0200 Subject: [PATCH 1/3] element-web-unwrapped: 1.11.112 -> 1.12.0 Release notes: https://github.com/element-hq/element-web/releases/tag/v1.12.0 Full changelog: https://github.com/element-hq/element-web/compare/v1.11.112...v1.12.0 --- pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index 1f4402615d71..bafd8b8ab7b1 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.112"; + "version" = "1.12.0"; "hashes" = { - "webSrcHash" = "sha256-rWbn3ibylEchBZR8ZF6lrPBSjJvF8Ezl/+7ZzgVhz7g="; - "webYarnHash" = "sha256-ItrmxNlaRijNpp+gk1g3tTLw4roHuTqW2SnpapIH1Uk="; + "webSrcHash" = "sha256-4e76IFOY7YiBX/cGobJNj1epH/Bnak+BgVPSjWC/8+s="; + "webYarnHash" = "sha256-qZPHWPmcGFtwfOSCpft0hFLuS7smmq9w1JxJ+oqJZPA="; }; } From 13b03e0faea9ea1d7b1f3395b4f8af19a50f0fba Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 23 Sep 2025 18:40:13 +0200 Subject: [PATCH 2/3] element-desktop: 1.11.112 -> 1.12.0 Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.12.0 Full changelog: https://github.com/element-hq/element-desktop/compare/v1.11.112...v1.12.0 --- pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 38563cd82576..bc82f74708f5 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.112"; + "version" = "1.12.0"; "hashes" = { - "desktopSrcHash" = "sha256-L4/2VwPHBusVTCi8DzxmAUbvW0p1d/ffbz9ZwUmgzEo="; - "desktopYarnHash" = "sha256-U+MuOe0N29AFrLCi7Xa9bDW70SmhQqqtjim+x7QAiJg="; + "desktopSrcHash" = "sha256-Epkjv6tT0I65JTu4O5nHFRn0q18kE1+7joyTF1S3y+4="; + "desktopYarnHash" = "sha256-2zy2xNzamjTyGE+Vm/gacMnby5Z0KfIWbgkl5EI5zi4="; }; } From 683abeec2529b2ac7658778ff51fd2d4a3ef1cda Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 23 Sep 2025 20:12:01 +0200 Subject: [PATCH 3/3] element-desktop: fix missing app icon Element Desktop switched to generation of icons with electron-builder, and no longer generates the icons with different resolutions. This commit simply copies the app icon into the outpath. --- pkgs/by-name/el/element-desktop/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 5597133194ba..fdf71bcea553 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -7,7 +7,7 @@ yarn, nodejs, jq, - electron_37, + electron_38, element-web, sqlcipher, callPackage, @@ -22,7 +22,7 @@ let pinData = import ./element-desktop-pin.nix; inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; - electron = electron_37; + electron = electron_38; keytar = callPackage ./keytar { inherit electron; }; @@ -111,11 +111,9 @@ stdenv.mkDerivation ( cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json - # icons - for icon in $out/share/element/electron/build/icons/*.png; do - mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" - ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png" - done + # icon + mkdir -p "$out/share/icons/hicolor/icon/apps" + ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/icon/apps/element.png" # desktop item mkdir -p "$out/share"