From 0ecb6e67daf0a9fd0ac47df5345ec819a57c5709 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sun, 9 Apr 2023 18:31:30 -0700
Subject: [PATCH] default.nix: move flashrom into the ownerboot packageset

Since we (unfortunately) need to use different forks of flashrom for
different platforms, flashrom must be overrideable.  Moving it into
the ownerboot packageset is the way to do that.
---
 src/default.nix                | 2 +-
 src/platform/kevin/default.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/default.nix b/src/default.nix
index 0252fe1..762356d 100644
--- a/src/default.nix
+++ b/src/default.nix
@@ -23,6 +23,7 @@ let
       kernel        = final.callPackage ./kernel { };
       userspace     = final.callPackage ./userspace { };
       initramfs     = final.callPackage ./initramfs { };
+      flashrom      = final.nixpkgsOnBuildForHost.callPackage ./util/flashrom { };
     };
   in
     (lib.makeScope
@@ -37,7 +38,6 @@ in {
   kgpe  = ownerboot (import ./platform/kgpe { inherit lib; });
 
   em100 = nixpkgsOnBuildForBuild.callPackage ./util/em100 { };
-  flashrom = nixpkgsOnBuildForBuild.callPackage ./util/flashrom { };
 }
 
 
diff --git a/src/platform/kevin/default.nix b/src/platform/kevin/default.nix
index 6ed1a06..b5d05e6 100644
--- a/src/platform/kevin/default.nix
+++ b/src/platform/kevin/default.nix
@@ -103,9 +103,11 @@ in {
 
     ecfw-scripts = final.nixpkgsOnBuildForHost.callPackage (import ./ecfw/scripts.nix) {
       inherit (final) ectool ecfw;
-      flashrom-chromebook = final.nixpkgsOnBuildForHost.callPackage ../../util/flashrom { forChromebook = true; };
+      flashrom-chromebook = final.flashrom;
     };
 
+    flashrom = prev.flashrom.override { forChromebook = true; };
+
     ectool = final.nixpkgsOnBuildForHost.callPackage (import ../../util/ectool { boardName = "kevin"; }) { };
   })];
 }