From dc40da30011d035d5f554799976908a1f5e0653b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 22 Nov 2022 15:17:30 +0100 Subject: devShells: include less packages --- devShells/default.nix | 2 +- devShells/nuttx.nix | 2 +- devShells/qt.nix | 5 ++++- devShells/riscv.nix | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) (limited to 'devShells') 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"; }; -- cgit v1.2.3