From e4a72293ae627c0ebc6f03a6427632114001d35d Mon Sep 17 00:00:00 2001 From: Bu Kun <65808665+pokon548@users.noreply.github.com> Date: Fri, 21 Feb 2025 15:00:56 +0800 Subject: [PATCH 1/2] wechat-uos: 4.0.1.7 -> 4.0.1.12 --- pkgs/by-name/we/wechat-uos/sources.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/we/wechat-uos/sources.nix b/pkgs/by-name/we/wechat-uos/sources.nix index bde4a6530722..4d3a19695a29 100644 --- a/pkgs/by-name/we/wechat-uos/sources.nix +++ b/pkgs/by-name/we/wechat-uos/sources.nix @@ -1,11 +1,11 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-12-18 +# Last updated: 2025-02-21 { - version = "4.0.1.7"; - amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.7_amd64.deb"; - arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.7_arm64.deb"; - loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.7_loongarch64.deb"; - amd64_hash = "sha256-v9WioyAoAUj/Nfep020bqY9KaF9B3yUY+7EPdjbfO7I="; - arm64_hash = "sha256-QD+8x8ss1VVG4BiotuZoWspzTJAZsr3MCcGbZgjmOF4="; - loongarch64_hash = "sha256-M+q+Kr/UZ2mdhXqpgH/XPBfwWMjVR/3DFB7geOporco="; + version = "4.0.1.12"; + amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb"; + arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb"; + loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb"; + amd64_hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU="; + arm64_hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8="; + loongarch64_hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo="; } From e12bc01f0a3756c2e0b21d018d0df31ac1b614a2 Mon Sep 17 00:00:00 2001 From: Bu Kun <65808665+pokon548@users.noreply.github.com> Date: Thu, 27 Feb 2025 10:55:24 +0800 Subject: [PATCH 2/2] wechat-uos: Remove hardened glibc as it seems no longer needed on 4.0.1.12 --- pkgs/by-name/we/wechat-uos/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 0791fd971288..02d8935bf1c4 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -47,11 +47,6 @@ writeShellScript, }: let - # zerocallusedregs hardening breaks WeChat - glibcWithoutHardening = stdenv.cc.libc.overrideAttrs (old: { - hardeningDisable = (old.hardeningDisable or [ ]) ++ [ "zerocallusedregs" ]; - }); - wechat-uos-env = stdenvNoCC.mkDerivation { meta.priority = 1; name = "wechat-uos-env"; @@ -68,9 +63,6 @@ let }; wechat-uos-runtime = with xorg; [ - # Make sure our glibc without hardening gets picked up first - (lib.hiPrio glibcWithoutHardening) - stdenv.cc.cc stdenv.cc.libc pango