From 6258f1e0c05b6679333e5e8caeef5853b6c1995a Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Sat, 27 Nov 2021 12:34:02 +0100
Subject: [PATCH] rearrange attributes

---
 default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index e463c0e9b9..ac42e758ac 100644
--- a/default.nix
+++ b/default.nix
@@ -65,6 +65,10 @@ let
           execFormat = { name = "unknown"; };
         };
       };
+      isStatic = true;
+      retro68BinutilsConfig = [ "--disable-plugins" ];
+      retro68GccConfig = [ "--disable-lto" ];
+      retro68 = true;
       cmakeSystemName = "RetroCarbon";
     };
 
@@ -336,8 +340,6 @@ let
     cross.mkShell {
       nativeBuildInputs =
         [ pkgs.hfsutils pkgs.retro68_tools pkgs.cmake pkgs.gnumake ];
-    }) crossPkgs;
+    } // cross) crossPkgs;
 
-  in {
-    inherit overlay crossPkgs shell;
-  }
+  in shell.m68k // shell // { inherit overlay; }