From 5a0a820e23a849d917765f74411d858039e4f708 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 14 Sep 2023 23:42:28 -0400
Subject: [PATCH] lib/release-tools: Fix eval

---
 lib/release-tools.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/release-tools.nix b/lib/release-tools.nix
index c31e78a6..b3412f5b 100644
--- a/lib/release-tools.nix
+++ b/lib/release-tools.nix
@@ -46,18 +46,20 @@ rec {
       specialConfig = {name, buildingForSystem, system, config ? {}}: {
         special = true;
         inherit name;
-        config = lib.mkMerge [
-          config
-          {
-            mobile.system.type = "none";
-            mobile.hardware.soc = {
-              x86_64-linux = "generic-x86_64";
-              aarch64-linux = "generic-aarch64";
-              armv7l-linux = "generic-armv7l";
-            }.${buildingForSystem};
-            nixpkgs.localSystem = knownSystems.${system};
-          }
-        ];
+        config = {
+          imports = [
+            config
+            {
+              mobile.system.type = "none";
+              mobile.hardware.soc = {
+                x86_64-linux = "generic-x86_64";
+                aarch64-linux = "generic-aarch64";
+                armv7l-linux = "generic-armv7l";
+              }.${buildingForSystem};
+              nixpkgs.localSystem = knownSystems.${system};
+            }
+          ];
+        };
       };
 
       # Shortcuts from a simple system name to the structure required for