diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-07-28 09:25:57 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-07-28 09:25:57 +0200 |
| commit | 97ba160010dd17bd04dd15a939d419ce7f6f2173 (patch) | |
| tree | b0ac51c5dd54d3e7f297478d20d3cdf40355088b /devShells | |
| parent | f7132927208e730e382d7725f83b2046e0e628f8 (diff) | |
| download | nixos-personal-97ba160010dd17bd04dd15a939d419ce7f6f2173.tar.gz nixos-personal-97ba160010dd17bd04dd15a939d419ce7f6f2173.tar.bz2 nixos-personal-97ba160010dd17bd04dd15a939d419ce7f6f2173.zip | |
Modify devShells
Diffstat (limited to 'devShells')
| -rw-r--r-- | devShells/c.nix | 19 | ||||
| -rw-r--r-- | devShells/nuttx.nix | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/devShells/c.nix b/devShells/c.nix index c1b5553..76e653c 100644 --- a/devShells/c.nix +++ b/devShells/c.nix @@ -4,17 +4,24 @@ let in pkgs.mkShell { packages = (with pkgs; [ + clang-tools gcc gdb pkg-config - cppcheck flawfinder bear - meson + + meson ninja bear + cmake + + cppcheck flawfinder + lcov massif-visualizer - ]); - inputsFrom = with pkgs; [ + check curl + gtk3 gtk4 - default - ]; + # LVGL + SDL2 libffi.dev + ]); + inputsFrom = with pkgs; [ default ]; meta.platforms = nixpkgs.lib.platforms.linux; } diff --git a/devShells/nuttx.nix b/devShells/nuttx.nix index 7fa690c..612465f 100644 --- a/devShells/nuttx.nix +++ b/devShells/nuttx.nix @@ -3,7 +3,7 @@ with nixpkgs.lib; let pkgs = nixpkgs.legacyPackages.${system}; - pkgs-riscv = import nixpkgs.outPath { + pkgs-cross = import nixpkgs.outPath { localSystem = system; crossSystem = { config = "arm-none-eabi" + (optionalString (fpu != null) "hf"); @@ -19,7 +19,7 @@ in pkgs.mkShell { gnumake kconfig-frontends genromfs xxd openocd - ]) ++ (with pkgs-riscv.buildPackages; [ + ]) ++ (with pkgs-cross.buildPackages; [ gcc gdb ]); inputsFrom = [ default ]; |