Skip to content

Use upstream xmake #155

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.

Sign up for GitHub

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

Merged
nbdd0121 merged 1 commit into from
Nov 26, 2025
+2 −74
Merged

Use upstream xmake #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@
cheriot = pkgs.mkShell {
name = "cheriot";
packages =
(with lowrisc_pkgs; [llvm_cheriot xmake])
(with lowrisc_pkgs; [llvm_cheriot])
++ (with pkgs; [
xmake
gnumake
magic-enum
srecord
Expand Down
1 change: 0 additions & 1 deletion pkgs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
# CherIoT packages
spike-ibex-cosim = pkgs.callPackage ./spike.nix {};
llvm_cheriot = pkgs.callPackage ./llvm_cheriot.nix {};
xmake = pkgs.callPackage ./xmake {};
cheriot-sim = pkgs.callPackage ./cheriot-sim.nix {};
cheriot-audit = pkgs.callPackage ./cheriot-audit.nix {};

Expand Down
46 changes: 0 additions & 46 deletions pkgs/xmake/default.nix
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions pkgs/xmake/macosx.patch
View file
Open in desktop

This file was deleted.