Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xmake: 2.9.4 -> 2.9.5 #343185

Merged
merged 3 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 19 additions & 32 deletions pkgs/development/tools/build-managers/xmake/default.nix
Original file line number Diff line number Diff line change
@@ -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
];
};
}

4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18916,8 +18916,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 { };
Expand Down