Take dhall from x86_64-linux nixpkgs
This commit is contained in:
parent
839f66e2de
commit
f9dfdbb995
|
@ -65,7 +65,7 @@
|
|||
forAllCrossSystems ({ system, localSystem, crossSystem }:
|
||||
nixpkgs.lib // (import ./lib {
|
||||
inherit system localSystem crossSystem;
|
||||
apps = self.apps.${system};
|
||||
localPackages = nixpkgs.legacyPackages.${localSystem};
|
||||
genodepkgs = self;
|
||||
nixpkgs = nixpkgsFor.${system};
|
||||
}));
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue