|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
{ system, localSystem, crossSystem, genodepkgs, nixpkgs, apps }: |
|
|
|
|
{ system, localSystem, crossSystem, genodepkgs, nixpkgs, localPackages }: |
|
|
|
|
|
|
|
|
|
let |
|
|
|
|
thisSystem = builtins.getAttr system; |
|
|
|
@ -17,7 +17,7 @@ in rec {
|
|
|
|
|
|
|
|
|
|
runDhallCommand = name: env: script: |
|
|
|
|
nixpkgs.runCommand name (env // { |
|
|
|
|
nativeBuildInputs = [ buildPackages.dhall ] |
|
|
|
|
nativeBuildInputs = [ localPackages.dhall ] |
|
|
|
|
++ env.nativeBuildInputs or [ ]; |
|
|
|
|
}) '' |
|
|
|
|
${dhallCachePrelude} |
|
|
|
@ -45,7 +45,7 @@ in rec {
|
|
|
|
|
nixpkgs.stdenv.mkDerivation { |
|
|
|
|
name = name + "-hw-image"; |
|
|
|
|
build = compileBoot name env boot; |
|
|
|
|
nativeBuildInputs = [ buildPackages.dhall ]; |
|
|
|
|
nativeBuildInputs = [ localPackages.dhall ]; |
|
|
|
|
buildCommand = let |
|
|
|
|
bootstrapDhall = |
|
|
|
|
# snippet used to nest core.elf into image.elf |
|
|
|
|