From c4e8a975f66d64c6629052faa2327f7bddf58f89 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 11 Oct 2025 22:34:16 +0800 Subject: [PATCH] libui-ng: only build native arch on darwin --- pkgs/by-name/li/libui-ng/darwin-no-universal.patch | 13 +++++++++++++ pkgs/by-name/li/libui-ng/package.nix | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/li/libui-ng/darwin-no-universal.patch diff --git a/pkgs/by-name/li/libui-ng/darwin-no-universal.patch b/pkgs/by-name/li/libui-ng/darwin-no-universal.patch new file mode 100644 index 000000000000..587490d0ab85 --- /dev/null +++ b/pkgs/by-name/li/libui-ng/darwin-no-universal.patch @@ -0,0 +1,13 @@ +--- a/meson.build ++++ b/meson.build +@@ -72,10 +72,6 @@ + libui_macosx_version_min = '-mmacosx-version-min=10.8' + add_global_arguments(libui_macosx_version_min, language: libui_darwin_langs) + add_global_link_arguments(libui_macosx_version_min, language: libui_darwin_langs) +- +- libui_arch = ['-arch', 'x86_64', '-arch', 'arm64'] +- add_global_arguments(libui_arch, language: libui_darwin_langs) +- add_global_link_arguments(libui_arch, language: libui_darwin_langs) + endif + + if libui_MSVC diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix index 54312f6918fd..d58d382a9a5a 100644 --- a/pkgs/by-name/li/libui-ng/package.nix +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation { hash = "sha256-pnfrSPDIvG0tFYQoeMBONATkNRNjY/tJGp9n2I4cN/U="; }; - postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - substituteInPlace meson.build --replace "'-arch', 'arm64'" "" - ''; + patches = [ + ./darwin-no-universal.patch + ]; nativeBuildInputs = [ cmocka