2
0
Fork 0

runDhallCommand: actually append extra nativeBuildInputs

This commit is contained in:
Emery Hemingway 2020-07-11 02:44:39 +05:30
parent 8beed15b64
commit 2d16e134aa
2 changed files with 3 additions and 3 deletions

View File

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

View File

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