From 2d16e134aa8e4778df1d2b0ce9c29d6293903eea Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sat, 11 Jul 2020 02:44:39 +0530
Subject: [PATCH] runDhallCommand: actually append extra nativeBuildInputs

---
 lib/default.nix                        | 2 +-
 nixos-modules/buildBootDescription.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index ac5190c..133c21b 100644
--- a/lib/default.nix
+++ b/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}
diff --git a/nixos-modules/buildBootDescription.nix b/nixos-modules/buildBootDescription.nix
index 511102e..345d33c 100644
--- a/nixos-modules/buildBootDescription.nix
+++ b/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);