Rework

6 files changed, 18 insertions, 47 deletions

diff --git a/devShells/apo.nix b/devShells/apo.nix
index b4ab8fd..a800557 100644
--- a/devShells/apo.nix
+++ b/devShells/apo.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  default,
-  c,
-}: let
+pkgs: c: let
   riscvPkgs = import pkgs.path {
     localSystem = pkgs.buildPlatform.system;
     crossSystem = {
@@ -18,6 +14,6 @@ in
       glibc.static
       riscvPkgs.buildPackages.gcc
     ];
-    inputsFrom = [default c];
+    inputsFrom = [c];
     meta.platforms = pkgs.lib.platforms.linux;
   }
diff --git a/devShells/c.nix b/devShells/c.nix
index e20fcc8..c28eafb 100644
--- a/devShells/c.nix
+++ b/devShells/c.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  default,
-}:
+pkgs:
 pkgs.mkShell {
   packages = with pkgs; [
     clang-tools_14
@@ -44,6 +41,5 @@ pkgs.mkShell {
     SDL2
     libffi.dev
   ];
-  inputsFrom = with pkgs; [default];
   meta.platforms = pkgs.lib.platforms.linux;
 }
diff --git a/devShells/default.nix b/devShells/default.nix
index 998a39b..1e46ad0 100644
--- a/devShells/default.nix
+++ b/devShells/default.nix
@@ -1,21 +1,11 @@
-pkgs: let
-  callDevelop = pkgs.lib.callPackageWith (shells // {inherit pkgs;});
-
-  shells = {
-    default = pkgs.mkShell {
-      packages = [];
-    };
-
-    armv6 = callDevelop ./nuttx.nix {arch = "armv6s-m";};
-    armv7e = callDevelop ./nuttx.nix {
-      arch = "armv7e-m";
-      fpu = "vfpv3-d16";
-    };
-    espc = callDevelop ./nuttx.nix {arch = "rv32imc";};
-    c = callDevelop ./c.nix {};
-    qt = callDevelop ./qt.nix {};
-    python = callDevelop ./python.nix {};
-    apo = callDevelop ./apo.nix {};
+pkgs: rec {
+  armv7e = import ./nuttx.nix pkgs c {
+    arch = "armv7e-m";
+    fpu = "vfpv3-d16";
   };
-in
-  shells
+  espc = import ./nuttx.nix pkgs c {arch = "rv32imc";};
+  c = import ./c.nix pkgs;
+  qt = import ./qt.nix pkgs c;
+  python = import ./python.nix pkgs;
+  apo = import ./apo.nix pkgs c;
+}
diff --git a/devShells/nuttx.nix b/devShells/nuttx.nix
index 506ea12..97675e9 100644
--- a/devShells/nuttx.nix
+++ b/devShells/nuttx.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  default,
-  c,
+pkgs: c: {
   arch,
   fpu ? null,
 }:
@@ -36,6 +33,6 @@ in
       ++ (optionals (hasPrefix "rv32" arch) [
         esptool
       ]);
-    inputsFrom = [default c];
+    inputsFrom = [c];
     meta.platforms = pkgsCross.lib.platforms.linux;
   }
diff --git a/devShells/python.nix b/devShells/python.nix
index 492644e..1bd1dad 100644
--- a/devShells/python.nix
+++ b/devShells/python.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  default,
-}:
+pkgs:
 pkgs.mkShell {
   packages = with pkgs; [
     (python3.withPackages (pypkgs:
@@ -50,6 +47,5 @@ pkgs.mkShell {
     gtk3
     gtk4
   ];
-  inputsFrom = with pkgs; [default];
   meta.platforms = pkgs.lib.platforms.linux;
 }
diff --git a/devShells/qt.nix b/devShells/qt.nix
index 2070009..35558c2 100644
--- a/devShells/qt.nix
+++ b/devShells/qt.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  default,
-  c,
-}:
+pkgs: c:
 pkgs.mkShell {
   packages = with pkgs;
   with libsForQt5; [
@@ -14,6 +10,6 @@ pkgs.mkShell {
     qtcharts
     qtwayland
   ];
-  inputsFrom = with pkgs; [default c];
+  inputsFrom = [c];
   meta.platforms = pkgs.lib.platforms.linux;
 }