diff --git a/nix/overlay.nix b/nix/overlay.nix
index 8d48ac4b07..65737471a5 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -136,7 +136,11 @@ pkgs: prevPkgs:
             set(MAKE_PEF "${pkgs.buildPackages.retro68.tools}/bin/MakePEF" )
 
             include(${../cmake/add_application.cmake})
-          '';
+          '' + (pkgs.lib.optionalString (systemName == "RetroCarbon") ''
+            set(CMAKE_EXE_LINKER_FLAGS_INIT "-carbon")
+            set(CMAKE_SHARED_LINKER_FLAGS_INIT "-carbon")
+            add_definitions( -DTARGET_API_MAC_CARBON=1 )
+          '');
         };
         hook = pkgs.writeTextFile {
           name = "retro68.setup_hook";
diff --git a/nix/platforms.nix b/nix/platforms.nix
index b360c70a2e..3f36c5956b 100644
--- a/nix/platforms.nix
+++ b/nix/platforms.nix
@@ -47,7 +47,7 @@
   };
   carbon = {
     system = "powerpc-carbon";
-    config = "powerpc-apple-carbon";
+    config = "powerpc-apple-macos";
     libc = "retro68";
     parsed = {
       cpu = {
diff --git a/nix/samples.nix b/nix/samples.nix
index 1ab397b945..e71bfaf15e 100644
--- a/nix/samples.nix
+++ b/nix/samples.nix
@@ -8,42 +8,28 @@ pkgs: prevPkgs: {
             src = path;
             nativeBuildInputs = [ buildPackages.ninja buildPackages.cmake ];
             buildInputs = [ retro68.console ];
-            buildCommand = ''
-              mkdir build
-              cd build
-              cmake $src -G Ninja
-              ninja
-              mkdir -p $out/Applications
-              mkdir -p $out/Applications/.finf
-              mkdir -p $out/Applications/.rsrc
-
-              cp *.APPL $out/Applications
-              cp .finf/*.APPL $out/Applications/.finf
-              cp .rsrc/*.APPL $out/Applications/.rsrc
-              for f in *.APPL; do
-                cp $'' + ''
-                {f%.APPL}.bin $out/Applications
-                                  done
-                                '';
+            installPhase = ''
+              mkdir $out
+              cp *.bin $out/
+            '';
           }) ({
             dialog = ../Samples/Dialog;
             helloworld = ../Samples/HelloWorld;
-            mpwtool = ../Samples/MPWTool;
             raytracer = ../Samples/Raytracer;
-            #systemextension = ../Samples/SystemExtension;
+          } // lib.optionalAttrs (targetPlatform.cmakeSystemName != "RetroCarbon") {
+            mpwtool = ../Samples/MPWTool;
             wdef = ../Samples/WDEF;
           } // lib.optionalAttrs (targetPlatform.cmakeSystemName != "Retro68") {
             sharedlibrary = ../Samples/SharedLibrary;
           } // lib.optionalAttrs (targetPlatform.cmakeSystemName == "Retro68") {
+            systemextension = ../Samples/SystemExtension;
             launcher = ../Samples/Launcher;
           });
       in runCommand "retro68.samples" { } ''
-        mkdir -p $out/Applications
-        mkdir -p $out/Applications/.rsrc
-        mkdir -p $out/Applications/.finf
+        mkdir -p $out/
 
         ${lib.concatMapStrings (x: ''
-          cp -r ${lib.escapeShellArg x}/Applications $out/
+          cp -r ${lib.escapeShellArg x}/*.bin $out/
         '') (builtins.attrValues individualSamples)}
       '' // individualSamples;
 
@@ -54,14 +40,7 @@ pkgs: prevPkgs: {
         nativeBuildInputs = [ buildPackages.ninja buildPackages.cmake ];
         installPhase = ''
           mkdir $out
-          mkdir -p $out/Applications
-          mkdir -p $out/Applications/.finf
-          mkdir -p $out/Applications/.rsrc
-
-          cp Server/LaunchAPPLServer.APPL $out/Applications
-          cp Server/.finf/LaunchAPPLServer.APPL $out/Applications/.finf
-          cp Server/.rsrc/LaunchAPPLServer.APPL $out/Applications/.rsrc
-          cp Server/LaunchAPPLServer.bin $out/Applications
+          cp *.bin $out/
         '';
       };
   });