File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed
Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -92,6 +92,7 @@ final: prev: {
9292 s2n-tls = self . callPackage ./deps/s2n-tls/default.nix { } ;
9393 http-parser = self . callPackage ./deps/http-parser/default.nix { } ;
9494 uzlib = self . callPackage ./deps/uzlib/default.nix { } ;
95+ libfdt = self . callPackage ./deps/libfdt/default.nix { } ;
9596
9697 vmbuild = self . callPackage ./vmbuild.nix { } ;
9798
@@ -165,6 +166,7 @@ final: prev: {
165166 self . http-parser
166167 self . libfmt
167168 # self.s2n-tls 👈 This is postponed until we can fix the s2n build.
169+ self . libfdt
168170 self . uzlib
169171 self . vmbuild
170172 ] ;
@@ -208,8 +210,14 @@ final: prev: {
208210 inherit ( self ) botan2 ;
209211 inherit ( self ) cmake ;
210212 inherit ( self ) http-parser ;
213+ <<<<<<< HEAD
211214 inherit ( self ) libfmt ;
212215 # inherit (self) s2n-tls;
216+ ||||||| parent of c0f128940 ( enable libfdt dependency )
217+ =======
218+ inherit ( self ) libfdt ;
219+ # inherit (self) s2n-tls;
220+ >>>>>>> c0f128940 ( enable libfdt dependency )
213221 inherit ( self ) uzlib ;
214222 inherit ( self ) vmbuild ;
215223 } ;
You can’t perform that action at this time.
0 commit comments