diff options
author | rewine <luhongxu@deepin.org> | 2024-09-27 09:56:07 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-27 09:56:07 +0800 |
commit | de38446996523da09e299aee94ceb73bd83a8bb4 (patch) | |
tree | 392a406f0d9c10e703edfc7c261881eff060edd2 | |
parent | a8566c88a6e6a43fe69d14483a9dad7f536c7cd7 (diff) | |
parent | a94fd59ceb8e36bec98e2e0a2c2524b8b62861b9 (diff) |
xmake: 2.9.4 -> 2.9.5 (#343185)
-rw-r--r-- | pkgs/development/tools/build-managers/xmake/default.nix | 51 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 21 insertions, 34 deletions
diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 184c038beae4a..073ca4ac017f9 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -1,48 +1,35 @@ -{ 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 ]; + maintainers = with maintainers; [ + rewine + rennsax + ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30fa353b7dfa6..146daf3109aa2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18876,8 +18876,8 @@ with pkgs; webdis = callPackage ../development/tools/database/webdis { }; - xmake = callPackage ../development/tools/build-managers/xmake { - lua = lua5_4; + 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 { }; |