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.
master
Adam Joseph 2 years ago
parent 3bdb75a387
commit 0ecb6e67da

@ -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 { };
}

@ -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"; }) { };
})];
}

Loading…
Cancel
Save