From 539f2e72919c36649dcc6480581291fce71e178c Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sun, 18 Aug 2024 11:34:52 -0700 Subject: [PATCH] wechat-uos: fix crashing issue caused by zerocallusedregs hardening --- pkgs/by-name/we/wechat-uos/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 5a794cde2a34f..959d05c9f10da 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -63,6 +63,11 @@ uosLicense ? null }: 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"; @@ -108,6 +113,9 @@ 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 @@ -240,7 +248,7 @@ let license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" "loongarch64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ pokon548 ]; + maintainers = with maintainers; [ pokon548 xddxdd ]; mainProgram = "wechat-uos"; }; };