diff options
| -rw-r--r-- | devShells/c.nix | 1 | ||||
| -rw-r--r-- | devShells/nuttx.nix | 8 | ||||
| -rw-r--r-- | devShells/riscv.nix | 8 |
3 files changed, 7 insertions, 10 deletions
diff --git a/devShells/c.nix b/devShells/c.nix index ee18801..a6ffbd6 100644 --- a/devShells/c.nix +++ b/devShells/c.nix @@ -26,6 +26,7 @@ in pkgs.mkShell { # Various libraries openssl.dev zlib.dev curl.dev libconfig + czmq libevent.dev # LVGL SDL2 libffi.dev diff --git a/devShells/nuttx.nix b/devShells/nuttx.nix index 0105fe5..145df61 100644 --- a/devShells/nuttx.nix +++ b/devShells/nuttx.nix @@ -4,8 +4,7 @@ }: with nixpkgs.lib; let - pkgs = nixpkgs.legacyPackages.${system}; - pkgs-cross = import nixpkgs.outPath { + pkgs = import nixpkgs.outPath { localSystem = system; crossSystem = { config = "arm-none-eabi" + (optionalString (fpu != null) "hf"); @@ -17,12 +16,11 @@ let }; in pkgs.mkShell { - packages = (with pkgs; [ + packages = with pkgs.buildPackages; [ kconfig-frontends genromfs xxd openocd - ]) ++ (with pkgs-cross.buildPackages; [ gcc gdb - ]); + ]; inputsFrom = [ default c ]; meta.platforms = nixpkgs.lib.platforms.linux; } diff --git a/devShells/riscv.nix b/devShells/riscv.nix index e9e33ef..0bcacb4 100644 --- a/devShells/riscv.nix +++ b/devShells/riscv.nix @@ -2,8 +2,7 @@ , default, c }: let - pkgs = nixpkgs.legacyPackages.${system}; - pkgs-riscv = import nixpkgs.outPath { + pkgs = import nixpkgs.outPath { localSystem = system; crossSystem = { config = "riscv32-none-elf"; @@ -15,11 +14,10 @@ let }; in pkgs.mkShell { - packages = (with pkgs; [ + packages = with pkgs.buildPackages; [ qtrvsim - ]) ++ (with pkgs-riscv.buildPackages; [ gcc pkg-config - ]); + ]; inputsFrom = [ default c ]; meta.platforms = nixpkgs.lib.platforms.linux; } |