Unverified Commit bbc5eb3e authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

libui-ng: only build native arch on darwin (#451014)

parents f9db5930 c4e8a975

pkgs/by-name/li/libui-ng/darwin-no-universal.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
--- 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

pkgs/by-name/li/libui-ng/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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