nemu: update devShell deps
Some checks failed
Build abstract machine with nix / build-abstract-machine (push) Failing after 1m10s
Run CTests within npc / npc-test (push) Failing after 1m37s

This commit is contained in:
xinyangli 2024-07-09 20:43:47 +08:00
parent 3acab0a751
commit 7c982b238b
Signed by: xin
SSH key fingerprint: SHA256:qZ/tzd8lYRtUFSrfBDBMcUqV4GHKxqeqRA3huItgvbk
2 changed files with 20 additions and 6 deletions

View file

@ -128,11 +128,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710242657, "lastModified": 1714032877,
"narHash": "sha256-tgaILHKZH6vC8P8N8NBMNQ/XIpTY72zMojlGLPLPLZk=", "narHash": "sha256-6KKe4xdHPQbGtM5icLHKxgcYyFKF47a98csTQG7vkvU=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "6a499c8371c6a14d11a8c2fcc9f233e7b8e688a0", "rev": "f6acae14927a6df78ce2304007369095e140da9c",
"revCount": 148, "revCount": 149,
"type": "git", "type": "git",
"url": "https://git.xinyang.life/xin/nur.git" "url": "https://git.xinyang.life/xin/nur.git"
}, },

View file

@ -22,6 +22,7 @@
overlays = [ overlays = [
(self: super: { (self: super: {
nvboard = nur-xin.legacyPackages.${system}.nvboard; nvboard = nur-xin.legacyPackages.${system}.nvboard;
mini-gdbstub = nur-xin.legacyPackages.${system}.mini-gdbstub;
}) })
]; ];
}; };
@ -65,23 +66,36 @@
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.cmake pkgs.cmake
pkgs.gcc # Generate expr tests
]; ];
cmakeFlags = [ cmakeFlags = [
(pkgs.lib.cmakeFeature "ISA" "riscv") (pkgs.lib.cmakeFeature "ARCH" "riscv-nemu")
(pkgs.lib.cmakeFeature "PLATFORM" "nemu")
]; ];
buildInputs = [ buildInputs = [
# SDL2 # SDL2
self.packages.${system}.abstract-machine self.packages.${system}.abstract-machine
]; ];
cmakeBuildType = "RelWithDebInfo";
dontStrip = true;
}; };
devShells.nemu = pkgs.mkShell { devShells.nemu = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
clang-tools clang-tools
gdb gdb
SDL2
gnumake
pkg-config
flex
bison
dtc
readline
libllvm
mini-gdbstub
]; ];
inputsFrom = [ inputsFrom = [
self.packages.${system}.nemu self.packages.${system}.nemu