diff options
| -rw-r--r-- | devShells/c.nix | 19 | ||||
| -rw-r--r-- | devShells/nuttx.nix | 4 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 1 |
4 files changed, 19 insertions, 11 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 ]; @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1658342534, - "narHash": "sha256-4uJmhOnJleJGCjkLOEWKqOKlKISn1wGedNAihYezV5w=", + "lastModified": 1658937758, + "narHash": "sha256-FxQB/tWX15Faq3GBM+qTfVzd9qJqy/3CEgBp2zpHeNc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "501bbad4ce34c9d81d6d2b75e7e7126a9db3907c", + "rev": "8f73de28e63988da02426ebb17209e3ae07f103b", "type": "github" }, "original": { @@ -28,6 +28,7 @@ self.nixosModules.default self.nixosModules."machine-${hostname}" shellrc.nixosModules.default + nixturris.nixosModules.turris-crossbuild (personal-secret.lib.personalSecrets hostname) { networking.hostName = hostname; |