devShells: allow easier inheritence

1 files changed, 15 insertions, 21 deletions

diff --git a/devShells/default.nix b/devShells/default.nix
index c459aba..24d8cfb 100644
--- a/devShells/default.nix
+++ b/devShells/default.nix
@@ -1,27 +1,21 @@
 { nixpkgs, shellrc, system }:
 let
 
-  default = let
-    pkgs = nixpkgs.legacyPackages.${system};
-  in pkgs.mkShell {
-    inputsFrom = with pkgs; [
-      shellrc.packages.${system}.default
-    ];
-  };
-
-  callDevelop = file: import file {
-    inherit system;
-    inherit nixpkgs;
-    inherit default;
-  };
+  callDevelop = nixpkgs.lib.callPackageWith ({
+      inherit system;
+      inherit nixpkgs;
+    } // shells);
 
-in {
+  shells = {
+    default = nixpkgs.legacyPackages.${system}.mkShell {
+      inputsFrom = [ shellrc.packages.${system}.default ];
+    };
 
-  default = default;
-  armv6 = callDevelop ./nuttx.nix { arch = "armv6s-m"; };
-  armv7e = callDevelop ./nuttx.nix { arch = "armv7e-m"; fpu = "vfpv3-d16"; };
-  c = callDevelop ./c.nix;
-  qt = callDevelop ./qt.nix;
-  riscv = callDevelop ./riscv.nix;
+    armv6 = callDevelop ./nuttx.nix { arch = "armv6s-m"; };
+    armv7e = callDevelop ./nuttx.nix { arch = "armv7e-m"; fpu = "vfpv3-d16"; };
+    c = callDevelop ./c.nix { };
+    qt = callDevelop ./qt.nix { };
+    riscv = callDevelop ./riscv.nix { };
+  };
 
-}
+in shells