runDhallCommand: actually append extra nativeBuildInputs
This commit is contained in:
parent
8beed15b64
commit
2d16e134aa
|
@ -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}
|
||||
|
|
|
@ -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…
Reference in New Issue