Browse Source

runDhallCommand: actually append extra nativeBuildInputs

i686
Emery Hemingway 1 year ago
parent
commit
2d16e134aa
  1. 2
      lib/default.nix
  2. 4
      nixos-modules/buildBootDescription.nix

2
lib/default.nix

@ -19,7 +19,7 @@ in rec {
runDhallCommand = name: env: script:
nixpkgs.runCommand name (env // {
nativeBuildInputs = [ buildPackages.dhall ] ++ env.buildPackages or [ ];
nativeBuildInputs = [ buildPackages.dhall ] ++ env.nativeBuildInputs or [ ];
}) ''
${dhallCachePrelude}
${script}

4
nixos-modules/buildBootDescription.nix

@ -12,11 +12,11 @@ let
extractDrv = lib.runDhallCommand "binaries.json" {
nativeBuildInputs = [ dhall-json ];
} ''
dhall-to-json << TRUE_DEATH > $out
dhall-to-json << EOF > $out
let Genode = env:DHALL_GENODE
let init = ${initConfig}
in Genode.Init.Child.binaries (Genode.Init.toChild init Genode.Init.Attributes::{=})
TRUE_DEATH
EOF
'';
binariesJSON = readFile (toString extractDrv);
binaries = lib.unique (fromJSON binariesJSON ++ extraBinaries);

Loading…
Cancel
Save