From 73b7af195495abcfc0ca0a78f2ddd30c3fc4326f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 7 Apr 2020 23:12:18 -0400
Subject: [PATCH 1/2] ci: Add assertion that validates evaluations are
 differents

See the following commit
---
 .ci/instantiate-all.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.ci/instantiate-all.nix b/.ci/instantiate-all.nix
index b29bbbd0..dc3a8ced 100644
--- a/.ci/instantiate-all.nix
+++ b/.ci/instantiate-all.nix
@@ -44,6 +44,9 @@ let
     ;
 
   flattened =
+    # If this fails, evaluations probably don't receive additional configuration
+    # configuring nixpkgs.localSystem.
+    assert devices."device.asus-z00t.aarch64-linux" != devices."device.asus-z00t.x86_64-linux";
     release //
     devices //
     # We could try and do something smart to unwrap two levels of attrsets

From 245ecceee4c7976754719a282e0215da4cc861dd Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 7 Apr 2020 23:13:07 -0400
Subject: [PATCH 2/2] default.nix: Pass additional config to evalWith

This broke eval for aarch64-linux platforms.

See the previous commit for an assertion that should prevent such
breakage from going through in the future.
---
 default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.nix b/default.nix
index db355671..f639b3c5 100644
--- a/default.nix
+++ b/default.nix
@@ -46,6 +46,7 @@ let
   eval = evalWith {
     device = final_device;
     modules = configuration;
+    inherit additionalConfiguration;
   };
 
   # This is used by the `-A installer` shortcut.