devShells: add apo and tweak qt

4 files changed, 43 insertions, 30 deletions

diff --git a/devShells/apo.nix b/devShells/apo.nix
new file mode 100644
index 0000000..dd8b772
--- /dev/null
+++ b/devShells/apo.nix
@@ -0,0 +1,34 @@
+{
+  system,
+  nixpkgs,
+  default,
+  c,
+}: let
+  pkgs = nixpkgs.legacyPackages.${system};
+  riscvPkgs = import nixpkgs.outPath {
+    localSystem = system;
+    crossSystem = {
+      config = "riscv32-none-elf";
+      libc = "newlib-nano";
+      gcc = {
+        arch = "rv32i";
+      };
+    };
+  };
+  mipsPkgs = import nixpkgs.outPath {
+    localSystem = system;
+    crossSystem = {
+      config = "mips-none-elf";
+      libc = "newlib-nano";
+    };
+  };
+in
+  pkgs.buildPackages.mkShell {
+    packages = with pkgs; [
+      qtrvsim
+      riscvPkgs.buildPackages.gcc
+      mipsPkgs.buildPackages.gcc
+    ];
+    inputsFrom = [default c];
+    meta.platforms = nixpkgs.lib.platforms.linux;
+  }
diff --git a/devShells/default.nix b/devShells/default.nix
index 2916f1c..e0c0dff 100644
--- a/devShells/default.nix
+++ b/devShells/default.nix
@@ -22,7 +22,7 @@
     espc = callDevelop ./nuttx.nix {arch = "rv32imc";};
     c = callDevelop ./c.nix {};
     qt = callDevelop ./qt.nix {};
-    riscv = callDevelop ./riscv.nix { };
+    #apo = callDevelop ./apo.nix { };
   };
 in
   shells
diff --git a/devShells/qt.nix b/devShells/qt.nix
index b6450eb..80b83b5 100644
--- a/devShells/qt.nix
+++ b/devShells/qt.nix
@@ -9,12 +9,16 @@ in
   pkgs.mkShell {
     packages = with pkgs;
     with libsForQt5; [
+      #full
       qtbase
       qtserialport
       qtwebsockets
       doctest
+      qtcharts
+      qtwayland
 
-      (qcoro.overrideAttrs (oldAttrs: {
+      (stdenv.mkDerivation {
+        pname = "qcoro";
         version = "0.6.1";
         src = fetchFromGitHub {
           owner = "danvratil";
@@ -22,8 +26,9 @@ in
           rev = "261663560f59a162c0c82158a6cde41089668871";
           sha256 = "OAYJpoW3b0boSYBfuzLrFvlYSmP3SON8O6HsDQoi+I8=";
         };
-        buildInputs = oldAttrs.buildInputs ++ [qt5.qtbase];
-      }))
+        buildInputs = [qtbase qtwebsockets];
+        nativeBuildInputs = [wrapQtAppsHook cmake];
+      })
     ];
     inputsFrom = with pkgs; [default c];
     meta.platforms = ["x86_64-linux"];
diff --git a/devShells/riscv.nix b/devShells/riscv.nix
deleted file mode 100644
index 8752e8d..0000000
--- a/devShells/riscv.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  system,
-  nixpkgs,
-  default,
-  c,
-}: let
-  pkgs = import nixpkgs.outPath {
-    localSystem = system;
-    crossSystem = {
-      config = "riscv32-none-elf";
-      libc = "newlib-nano";
-      gcc = {
-        arch = "rv32i";
-      };
-    };
-  };
-in
-  pkgs.buildPackages.mkShell {
-    packages = with pkgs.buildPackages; [
-      buildPackages.qtrvsim
-      gcc
-      pkg-config
-    ];
-    inputsFrom = [default c];
-    meta.platforms = nixpkgs.lib.platforms.linux;
-  }