diff options
Diffstat (limited to 'devShells')
| -rw-r--r-- | devShells/default.nix | 2 | ||||
| -rw-r--r-- | devShells/nuttx.nix | 2 | ||||
| -rw-r--r-- | devShells/qt.nix | 5 | ||||
| -rw-r--r-- | devShells/riscv.nix | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/devShells/default.nix b/devShells/default.nix index 02ecc11..1e8dee3 100644 --- a/devShells/default.nix +++ b/devShells/default.nix @@ -16,7 +16,7 @@ let espc = callDevelop ./nuttx.nix { arch = "rv32imc"; }; c = callDevelop ./c.nix { }; qt = callDevelop ./qt.nix { }; - riscv = callDevelop ./riscv.nix { }; + #riscv = callDevelop ./riscv.nix { }; }; in shells diff --git a/devShells/nuttx.nix b/devShells/nuttx.nix index ef6e632..2d3e271 100644 --- a/devShells/nuttx.nix +++ b/devShells/nuttx.nix @@ -11,7 +11,7 @@ let config = if (hasPrefix "armv" arch) then "arm-none-eabi" + (optionalString (fpu != null) "hf") else "riscv32-none-elf"; - libc = "newlib"; + libc = "newlib-nano"; gcc = { arch = arch; } // (optionalAttrs (fpu != null) { fpu = fpu; }); diff --git a/devShells/qt.nix b/devShells/qt.nix index e16af50..8bcce47 100644 --- a/devShells/qt.nix +++ b/devShells/qt.nix @@ -6,7 +6,10 @@ let in pkgs.mkShell { packages = (with pkgs; with libsForQt5; [ - qt5.qtbase + qtbase + qtserialport + qtserialport + qtwebsockets doctest (qcoro.overrideAttrs (oldAttrs: { diff --git a/devShells/riscv.nix b/devShells/riscv.nix index f17b85d..99a0259 100644 --- a/devShells/riscv.nix +++ b/devShells/riscv.nix @@ -6,7 +6,7 @@ let localSystem = system; crossSystem = { config = "riscv32-none-elf"; - libc = "newlib"; + libc = "newlib-nano"; gcc = { arch = "rv32i"; }; |