use callPackageWith to cleanup some logic

flake.nix

@@ -35,7 +35,7 @@
 
         compile-deps = rocBuild.compile-deps;
         inherit (compile-deps) zigPkg llvmPkgs llvmVersion
-            llvmMajorMinorStr glibcPath libGccSPath darwinInputs;
+          llvmMajorMinorStr glibcPath libGccSPath darwinInputs;
 
         # DevInputs are not necessary to build roc as a user 
         linuxDevInputs = with pkgs;
@@ -155,6 +155,12 @@
         formatter = pkgs.nixpkgs-fmt;
 
         # You can build this package (the roc CLI) with the `nix build` command.
-        packages.default = rocBuild.roc-cli;
+        packages = {
+          default = rocBuild.roc-cli;
+
+          cli = rocBuild.roc-cli;
+
+          lang-server = rocBuild.roc-lang-server;
+        };
       });
 }

nix/default.nix

@@ -5,12 +5,20 @@ let
     cargo = rustVersion;
     rustc = rustVersion;
   };
-  compile-deps = pkgs.callPackage ./compile-deps.nix { };
+
+  # this will allow our callPackage to reference our own packages defined below
+  # mainly helps with passing compile-deps and rustPlatform to builder automatically
+  callPackage = pkgs.lib.callPackageWith (pkgs // packages);
+
+  packages = {
+    inherit rustPlatform;
+    compile-deps = callPackage ./compile-deps.nix { };
+    rust-shell =
+      (rustVersion.override { extensions = [ "rust-src" "rust-analyzer" ]; });
+
+    roc-cli = callPackage ./builder.nix { }; # TODO: this builds the language server as `roc_ls`
+    roc-lang-server = callPackage ./builder.nix { subPackage = "lang_srv"; };
+  };
+
 in
-{
+packages
-  inherit rustPlatform compile-deps;
-  rust-shell =
-    (rustVersion.override { extensions = [ "rust-src" "rust-analyzer" ]; });
-  roc-cli = pkgs.callPackage ./roc-cli.nix { inherit compile-deps rustPlatform; };
-  roc-lang-server = {};
-}