From f9dfdbb995e52753aced13e941b828ea9fa97d0f Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 22 Oct 2020 20:06:46 +0200
Subject: [PATCH] Take dhall from x86_64-linux nixpkgs

---
 flake.nix       | 2 +-
 lib/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 85a0bcd..37cfbc2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,7 @@
         forAllCrossSystems ({ system, localSystem, crossSystem }:
           nixpkgs.lib // (import ./lib {
             inherit system localSystem crossSystem;
-            apps = self.apps.${system};
+            localPackages = nixpkgs.legacyPackages.${localSystem};
             genodepkgs = self;
             nixpkgs = nixpkgsFor.${system};
           }));
diff --git a/lib/default.nix b/lib/default.nix
index 5eebd36..cc57fc5 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,4 @@
-{ system, localSystem, crossSystem, genodepkgs, nixpkgs, apps }:
+{ system, localSystem, crossSystem, genodepkgs, nixpkgs, localPackages }:
 
 let
   thisSystem = builtins.getAttr system;
@@ -17,7 +17,7 @@ in rec {
 
   runDhallCommand = name: env: script:
     nixpkgs.runCommand name (env // {
-      nativeBuildInputs = [ buildPackages.dhall ]
+      nativeBuildInputs = [ localPackages.dhall ]
         ++ env.nativeBuildInputs or [ ];
     }) ''
       ${dhallCachePrelude}
@@ -45,7 +45,7 @@ in rec {
     nixpkgs.stdenv.mkDerivation {
       name = name + "-hw-image";
       build = compileBoot name env boot;
-      nativeBuildInputs = [ buildPackages.dhall ];
+      nativeBuildInputs = [ localPackages.dhall ];
       buildCommand = let
         bootstrapDhall =
           # snippet used to nest core.elf into image.elf