ehmry/genodepkgs
ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

Take dhall from x86_64-linux nixpkgs

This commit is contained in:
Ehmry - 2020-10-22 20:06:46 +02:00
parent 839f66e2de
commit f9dfdbb995
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -65,7 +65,7 @@
forAllCrossSystems ({ system, localSystem, crossSystem }: forAllCrossSystems ({ system, localSystem, crossSystem }:
nixpkgs.lib // (import ./lib { nixpkgs.lib // (import ./lib {
inherit system localSystem crossSystem; inherit system localSystem crossSystem;
apps = self.apps.${system}; localPackages = nixpkgs.legacyPackages.${localSystem};
genodepkgs = self; genodepkgs = self;
nixpkgs = nixpkgsFor.${system}; nixpkgs = nixpkgsFor.${system};
})); }));

6
lib/default.nix
View File

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