building lotus.

Author: kivikakk

.gitignore

@@ -40,5 +40,3 @@ compile_commands.json
 # Twister test output directories
 twister-out*
 flash.bin
-/venv
-/result

.gitmodules

@@ -6,21 +6,13 @@
 
     zephyr-nix.url = github:adisbladis/zephyr-nix;
     zephyr-nix.inputs.nixpkgs.follows = "nixpkgs";
-
-    ec.url = github:FrameworkComputer/EmbeddedController?ref=fwk-lotus-azalea-19573;
-    ec.flake = false;
-
-    u-boot.url = git+https://chromium.googlesource.com/chromiumos/third_party/u-boot?ref=upstream/next;
-    u-boot.flake = false;
   };
 
   outputs = {
     self,
     nixpkgs,
     flake-utils,
     zephyr-nix,
-    ec,
-    u-boot,
   }:
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = import nixpkgs {inherit system;};
@@ -34,19 +26,159 @@
         ${pkgs.toml-cli}/bin/toml set pyproject.toml project.dynamic license | ${pkgs.moreutils}/bin/sponge pyproject.toml
         sed -e 's/dynamic = "license"/dynamic = ["license"]/' -i pyproject.toml
       '';
+
+      pyelftools = pkgs.fetchgit {
+        name = "pyelftools";
+        url = "https://chromium.googlesource.com/chromiumos/third_party/pyelftools";
+        rev = "refs/heads/chromeos-0.22";
+        hash = "sha256-MArasbUre77vVGThaPxNotukIX+lGiNC4mhzZT52vl8=";
+      };
+
+      crosutils = pkgs.fetchgit {
+        name = "crosutils";
+        url = "https://chromium.googlesource.com/chromiumos/platform/crosutils";
+        rev = "refs/heads/main";
+        hash = "sha256-ahnXEetj99TLEocogZcSSUdj/r0QXiOw1OIVRrMt0cI=";
+      };
+
+      ec = pkgs.fetchFromGitHub {
+        name = "ec";
+        owner = "FrameworkComputer";
+        repo = "EmbeddedController";
+        rev = "fwk-lotus-azalea-19573";
+        hash = "sha256-37iKyZdOy8K/a8fsvaTjiC9cTkcP0JbvsfB7t1XAIco=";
+      };
+
+      cmsis = pkgs.fetchgit {
+        name = "cmsis";
+        url = "https://chromium.googlesource.com/chromiumos/third_party/zephyr/cmsis";
+        rev = "4aa3ff8e4f8a21e31cd9831b943acb7a7cd56ac8";
+        hash = "sha256-IKmdIn/K1eHBVxA0sNvzr1i5LpkgJQMAMsks13lmDNw=";
+      };
+
+      hal_stm32 = pkgs.fetchgit {
+        name = "hal_stm32";
+        url = "https://chromium.googlesource.com/chromiumos/third_party/zephyr/hal_stm32";
+        rev = "refs/heads/chromeos-main";
+        hash = "sha256-r1aks0sgUrJeX8t2lO98sOtGjBMvHgt2St0am+qEz3E=";
+      };
+
+      zephyr = pkgs.fetchFromGitHub {
+        name = "zephyr";
+        owner = "FrameworkComputer";
+        repo = "zephyr";
+        rev = "lotus-zephyr";
+        hash = "sha256-KgTh39Ba9jDByv7+9gDdZHCl2OOku3Y3yxq0Pt4GeBo=";
+      };
+
+      nanopb = pkgs.fetchgit {
+        name = "nanopb";
+        url = "https://chromium.googlesource.com/chromiumos/third_party/zephyr/nanopb";
+        rev = "refs/heads/main";
+        hash = "sha256-qt9ey7dbuqxIAhc4BKm0EqkMusOdsuQZNppmaN4ZVfA=";
+      };
+
+      u-boot = pkgs.fetchgit {
+        name = "u-boot";
+        url = "https://chromium.googlesource.com/chromiumos/third_party/u-boot";
+        rev = "refs/heads/upstream/next";
+        hash = "sha256-h5y0M1dupdO9CNG+OhUYi56UXsWAL5B0PTnhx+gU3FA=";
+        fetchSubmodules = false;
+      };
+
+      depot_tools = pkgs.fetchgit {
+        name = "depot_tools";
+        url = "https://chromium.googlesource.com/chromium/tools/depot_tools";
+        rev = "84edf22d0e5bf3f9ae60714ed9789fd62f86cf2a";
+        hash = "sha256-3t03DdZ+dRen1z3PTyGt2rDPHIHTe+qS8ek/bH4kuKo=";
+      };
     in rec {
       formatter = pkgs.alejandra;
 
+      packages.default = packages.lotus;
+      packages.lotus = pkgs.stdenv.mkDerivation {
+        name = "lotus";
+        
+        srcs = [
+          pyelftools
+          crosutils
+          ec
+          cmsis
+          hal_stm32
+          zephyr
+          nanopb
+          u-boot
+          depot_tools
+        ];
+
+        sourceRoot = ".";
+
+        postPatch = ''
+          mkdir .repo
+
+          mkdir -p chromite/third_party
+          mv pyelftools chromite/third_party/pyelftools
+
+          mkdir -p src
+          mv crosutils src/scripts
+
+          mkdir -p src/platform
+          mv ec src/platform/ec
+
+          mkdir -p src/third_party/zephyr
+          mv cmsis src/third_party/zephyr/cmsis
+
+          mkdir -p src/third_party/zephyr
+          mv hal_stm32 src/third_party/zephyr/hal_stm32
+
+          mkdir -p src/third_party/zephyr
+          mv zephyr src/third_party/zephyr/main
+
+          mkdir -p src/third_party/zephyr
+          mv nanopb src/third_party/zephyr/nanopb
+
+          mkdir -p src/third_party/u-boot
+          mv u-boot src/third_party/u-boot/files
+
+          mkdir -p src/chromium
+          mv depot_tools src/chromium/depot_tools
+        '';
+
+        nativeBuildInputs = [
+          zephyr-sdk
+          pkgs.cmake
+          pkgs.git
+          pkgs.ninja
+          pythonPkgs.pyyaml
+          pythonPkgs.pykwalify
+          pythonPkgs.packaging
+          pythonPkgs.pyelftools
+          pythonPkgs.colorama
+          packages.binman
+        ];
+
+        dontUseCmakeConfigure = true;
+
+        buildPhase = ''
+          ${packages.zmake}/bin/zmake -j8 build lotus -DCMAKE_MAKE_PROGRAM="${pkgs.ninja}/bin/ninja" -DBUILD_VERSION=awawa
+        '';
+        installPhase = ''
+          mkdir $out
+          cp src/platform/ec/build/zephyr/lotus/output/* $out/
+        '';
+      };
+
       packages.zmake = pythonPkgs.buildPythonPackage {
         name = "zmake";
-        src = "${ec}/zephyr/zmake";
+        src = ec;
+        sourceRoot = "ec/zephyr/zmake";
         pyproject = true;
+        build-system = [pythonPkgs.setuptools];
 
-        propagatedBuildInputs = with pkgs; [gcc dtc];
-
+        # The DYLD_LIBRARY_PATH part here is only needed for Darwin, but it
+        # doesn't harm Linux.
         postPatch = ''
-          # TODO: binman not found.
-            echo sed -e 's#"/bin:/usr/bin"#"/bin:/usr/bin:${pkgs.gcc}/bin:${pkgs.dtc}/bin","DYLD_LIBRARY_PATH":"${pkgs.dtc}/lib"#'  -i src/platform/ec/zephyr/zmake/zmake/jobserver.py
+          sed -e 's#"/bin:/usr/bin"#"/bin:/usr/bin:${pkgs.gcc}/bin:${pkgs.dtc}/bin","DYLD_LIBRARY_PATH":"${pkgs.dtc}/lib"#' -i zmake/jobserver.py
         '';
       };
 
@@ -56,10 +188,15 @@
         pyproject = false;
         build-system = [pythonPkgs.setuptools];
 
+        # zmake calls (sys.executable, path-to-binman, ...) on purpose, so we
+        # can't wrap it. This makes it unsuitable for calling directly, however.
+        dontWrapPythonPrograms = true;
+
         buildInputs = [
           pythonPkgs.pypaBuildHook
           pythonPkgs.pipInstallHook
         ];
+
         dependencies = [
           pythonPkgs.setuptools
           packages.u_boot_pylib
@@ -121,7 +258,7 @@
           pythonPkgs.pyelftools
           pythonPkgs.colorama
           pythonPkgs.setuptools
-          pythonPkgs.libfdt # <- 311 version fails to build; can't build with pip.
+          pythonPkgs.libfdt
           dtc
           cmake
           ninja