Skip to content

Commit ab73472

Browse files
committed
Use upstream xmake
Previously we use our own xmake because upstream one is broken, but it was fixed upstream already.
1 parent 00d2ae3 commit ab73472

File tree

4 files changed

+2
-74
lines changed

4 files changed

+2
-74
lines changed

flake.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@
9090
cheriot = pkgs.mkShell {
9191
name = "cheriot";
9292
packages =
93-
(with lowrisc_pkgs; [llvm_cheriot xmake])
93+
(with lowrisc_pkgs; [llvm_cheriot])
9494
++ (with pkgs; [
95+
xmake
9596
gnumake
9697
magic-enum
9798
srecord

pkgs/default.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
# CherIoT packages
2020
spike-ibex-cosim = pkgs.callPackage ./spike.nix {};
2121
llvm_cheriot = pkgs.callPackage ./llvm_cheriot.nix {};
22-
xmake = pkgs.callPackage ./xmake {};
2322
cheriot-sim = pkgs.callPackage ./cheriot-sim.nix {};
2423
cheriot-audit = pkgs.callPackage ./cheriot-audit.nix {};
2524

pkgs/xmake/default.nix

Lines changed: 0 additions & 46 deletions
This file was deleted.

pkgs/xmake/macosx.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)