From e8e566bfa4513f01b585dfbb995941dac2979c2b Mon Sep 17 00:00:00 2001
From: Bojun Ren <bj.ren.coding@outlook.com>
Date: Fri, 20 Sep 2024 13:19:10 +0800
Subject: [PATCH 1/3] xmake: 2.9.4 -> 2.9.5

---
 .../tools/build-managers/xmake/default.nix    | 46 ++++++-------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix
index 184c038beae4a..0634d948496d6 100644
--- a/pkgs/development/tools/build-managers/xmake/default.nix
+++ b/pkgs/development/tools/build-managers/xmake/default.nix
@@ -1,48 +1,32 @@
-{ lib
-, stdenv
-, fetchurl
-, pkg-config
-, lua
-, readline
-, ncurses
-, lz4
-, tbox
-, xmake-core-sv
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  CoreServices,
 }:
-
 stdenv.mkDerivation rec {
   pname = "xmake";
-  version = "2.9.4";
-
+  version = "2.9.5";
   src = fetchurl {
     url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
-    hash = "sha256-deLd4r0qSKMymJuAGuZQd8RS1JH+xRep2yeoHIcTzcU=";
+    hash = "sha256-A/61eH4i+rjdQEGew9hKvTWrzZ+KGyTEiMfrVx1nJMg=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    lua
-    lua.pkgs.cjson
-    readline
-    ncurses
-    lz4
-    tbox
-    xmake-core-sv
+  patches = [
+    (fetchpatch {
+      name = "xmake-fix-configure-compatibility.patch";
+      url = "https://github.com/xmake-io/xmake/commit/2a1220727a367e753b92131577ab0c2fd974bff8.patch";
+      hash = "sha256-xknlyydHvdwqTl975VQogKozT8nAp5+gPZQuRl1yXKE=";
+    })
   ];
 
-  strictDeps = true;
-
-  configureFlags = [ "--external=y" ];
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices;
 
   meta = with lib; {
     description = "Cross-platform build utility based on Lua";
     homepage = "https://xmake.io";
     license = licenses.asl20;
-    platforms = lua.meta.platforms;
     maintainers = with maintainers; [ rewine ];
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7686e74248909..4fb008387e5ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18917,7 +18917,7 @@ with pkgs;
   webdis = callPackage ../development/tools/database/webdis { };
 
   xmake = callPackage ../development/tools/build-managers/xmake {
-    lua = lua5_4;
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
   xc3sprog = callPackage ../development/embedded/xc3sprog { };

From 05866ec145bdb15bda0c9ba2c97e0467e3a9b5f7 Mon Sep 17 00:00:00 2001
From: Bojun Ren <bj.ren.coding@outlook.com>
Date: Thu, 26 Sep 2024 10:39:15 +0800
Subject: [PATCH 2/3] xmake: add rennsax as the maintainer

---
 pkgs/development/tools/build-managers/xmake/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix
index 0634d948496d6..073ca4ac017f9 100644
--- a/pkgs/development/tools/build-managers/xmake/default.nix
+++ b/pkgs/development/tools/build-managers/xmake/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     description = "Cross-platform build utility based on Lua";
     homepage = "https://xmake.io";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rewine ];
+    maintainers = with maintainers; [
+      rewine
+      rennsax
+    ];
   };
 }

From a94fd59ceb8e36bec98e2e0a2c2524b8b62861b9 Mon Sep 17 00:00:00 2001
From: Bojun Ren <bj.ren.coding@outlook.com>
Date: Thu, 26 Sep 2024 18:57:44 +0800
Subject: [PATCH 3/3] xmake: fix build on x86_64-darwin

xmake requires macOS SDK >= 10.13.0, but Nixpkgs sticks to macOS 10.12.0 for
x86_64-darwin now. Use 11.0 SDK as recommended by the doc.
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fb008387e5ca..68e5a813e944e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18916,8 +18916,8 @@ with pkgs;
 
   webdis = callPackage ../development/tools/database/webdis { };
 
-  xmake = callPackage ../development/tools/build-managers/xmake {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  xmake = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/xmake {
+    inherit (darwin.apple_sdk_11_0.frameworks) CoreServices;
   };
 
   xc3sprog = callPackage ../development/embedded/xc3sprog { };