refac(build): #919 cleaner bootstrap

- Bootstrap building makes with makes in a more
  makes-ified way

Signed-off-by: Kevin Amado <[email protected]>

default.nix

@@ -2,40 +2,17 @@
 #
 # SPDX-License-Identifier: MIT
 {system ? builtins.currentSystem}: let
-  args = import ./src/args/agnostic.nix {inherit system;};
-  makesVersion = "22.10";
+  agnostic = import ./src/args/agnostic.nix {inherit system;};
 
-  inherit (args) __nixpkgs__;
-  inherit (args) makeScript;
-in
-  makeScript {
-    aliases = [
-      "m-v${makesVersion}"
-      "makes"
-      "makes-v${makesVersion}"
-    ];
-    replace = {
-      __argMakesSrc__ = ./.;
-      __argNixStable__ = __nixpkgs__.nixStable;
-      __argNixUnstable__ = __nixpkgs__.nixUnstable;
-    };
-    entrypoint = ''
-      __MAKES_SRC__=__argMakesSrc__ \
-      __NIX_STABLE__=__argNixStable__ \
-      __NIX_UNSTABLE__=__argNixUnstable__ \
-      python -u __argMakesSrc__/src/cli/main/__main__.py "$@"
-    '';
-    searchPaths = {
-      bin = [
-        __nixpkgs__.cachix
-        __nixpkgs__.git
-        __nixpkgs__.gnutar
-        __nixpkgs__.gzip
-        __nixpkgs__.nixStable
-      ];
-      source = [
-        (import ./makes/cli/pypi/main.nix args)
-      ];
+  args =
+    agnostic
+    // {
+      outputs."/cli/env/runtime" =
+        import ./makes/cli/env/runtime/main.nix args;
+      outputs."/cli/env/runtime/pypi" =
+        import ./makes/cli/env/runtime/pypi/main.nix args;
+      projectPath = import ./src/args/project-path args;
+      projectSrc = ./.;
     };
-    name = "m";
-  }
+in
+  import ./makes/main.nix args

makes.nix

@@ -53,7 +53,7 @@
         inputs.nixpkgs.mdbook-mermaid
         inputs.nixpkgs.reuse
       ];
-      source = [outputs."/cli/pypi"];
+      source = [outputs."/cli/env/runtime"];
     };
   };
   envVars = {

makes/cli/env/runtime/main.nix

@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
+#
+# SPDX-License-Identifier: MIT
+{
+  __nixpkgs__,
+  makeSearchPaths,
+  outputs,
+  ...
+}:
+makeSearchPaths {
+  bin = [
+    __nixpkgs__.cachix
+    __nixpkgs__.git
+    __nixpkgs__.gnutar
+    __nixpkgs__.gzip
+    __nixpkgs__.nixStable
+  ];
+  source = [
+    outputs."/cli/env/runtime/pypi"
+  ];
+}

makes/cli/pypi/main.nix → makes/cli/env/runtime/pypi/main.nix

@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: MIT
 {makePythonPypiEnvironment, ...}:
 makePythonPypiEnvironment {
-  name = "cli-pypi";
+  name = "cli-env-runtime-pypi";
   sourcesYaml = ./pypi-sources.yaml;
 }

makes/main.nix

@@ -1,5 +1,34 @@
 # SPDX-FileCopyrightText: 2022 Fluid Attacks and Makes contributors
 #
 # SPDX-License-Identifier: MIT
-{projectPath, ...}:
-import (projectPath "/") {}
+{
+  __nixpkgs__,
+  makeScript,
+  outputs,
+  projectPath,
+  ...
+}: let
+  makesVersion = "22.10";
+in
+  makeScript {
+    aliases = [
+      "m-v${makesVersion}"
+      "makes"
+      "makes-v${makesVersion}"
+    ];
+    replace = {
+      __argMakesSrc__ = projectPath "/";
+      __argNixStable__ = __nixpkgs__.nixStable;
+      __argNixUnstable__ = __nixpkgs__.nixUnstable;
+    };
+    entrypoint = ''
+      __MAKES_SRC__=__argMakesSrc__ \
+      __NIX_STABLE__=__argNixStable__ \
+      __NIX_UNSTABLE__=__argNixUnstable__ \
+      python -u __argMakesSrc__/src/cli/main/__main__.py "$@"
+    '';
+    searchPaths.source = [
+      outputs."/cli/env/runtime"
+    ];
+    name = "m";
+  }