src/plat/*: pass `lib` as a parameter instead of reimporting it

master
Adam Joseph 2 years ago
parent ed0d745ca4
commit 0bdf6e9355

@ -26,9 +26,9 @@ let
.overrideScope' overlay; .overrideScope' overlay;
in { in {
# one entry for each supported platform # one entry for each supported platform
kevin = ownerboot (import ./platform/kevin); kevin = ownerboot (import ./platform/kevin { inherit lib; });
am1i = ownerboot (import ./platform/am1i); am1i = ownerboot (import ./platform/am1i { inherit lib; });
kgpe = ownerboot (import ./platform/kgpe); kgpe = ownerboot (import ./platform/kgpe { inherit lib; });
em100 = nixpkgsOnBuildForBuild.callPackage ./util/em100 { }; em100 = nixpkgsOnBuildForBuild.callPackage ./util/em100 { };
flashrom = nixpkgsOnBuildForBuild.callPackage ./flashrom { }; flashrom = nixpkgsOnBuildForBuild.callPackage ./flashrom { };

@ -1,5 +1,7 @@
{ lib ? import <nixpkgs/lib>
}:
{ {
hostPlatform = (import <nixpkgs/lib>).systems.examples.gnu64; hostPlatform = lib.systems.examples.gnu64;
overlay = (final: prev: { overlay = (final: prev: {

@ -1,3 +1,5 @@
{ lib ? import <nixpkgs/lib>
}:
let let
# order matters! this is also the order in which the modules are insmoded # order matters! this is also the order in which the modules are insmoded
modules_insmod = [ modules_insmod = [
@ -31,7 +33,7 @@ let
"drivers/net/wireless/marvell/mwifiex/mwifiex.ko" "drivers/net/wireless/marvell/mwifiex/mwifiex.ko"
]; ];
in { in {
hostPlatform = (import <nixpkgs/lib>).systems.examples.aarch64-multiplatform; hostPlatform = lib.systems.examples.aarch64-multiplatform;
overlay = (final: prev: { overlay = (final: prev: {
nixpkgsOnBuildForHost = prev.nixpkgsOnBuildForBuild.pkgsCross.aarch64-multiplatform; nixpkgsOnBuildForHost = prev.nixpkgsOnBuildForBuild.pkgsCross.aarch64-multiplatform;

@ -1,8 +1,10 @@
{ lib ? import <nixpkgs/lib>
}:
let let
update_microcode = true; update_microcode = true;
in in
{ {
hostPlatform = (import <nixpkgs/lib>).systems.examples.gnu64; hostPlatform = lib.systems.examples.gnu64;
overlay = (final: prev: { overlay = (final: prev: {

Loading…
Cancel
Save