feat: Fix in macos

flake.lock

@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1718527741,
-        "narHash": "sha256-cTwMrSIvserz71bX3RV4ctqE2QAVBCo7XqqmmvLOveQ=",
+        "lastModified": 1718616244,
+        "narHash": "sha256-FU5eDMBpJsCz2DI1xXtNJ8VS3ywG//pJzJxkHq7AvFo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "067a64af767445e90ae63462dd4fef142e16f57b",
+        "rev": "d1b5c45553e33bd41ce99bfe8d2560d20352c8a8",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718504420,
-        "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=",
+        "lastModified": 1718590793,
+        "narHash": "sha256-92OO8XrQTvdvDtRi0BAkjTaoZXW5ORuvqdk677wW7ko=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9",
+        "rev": "5265b8a1e1d2e370e8b45b557326b691aec7d163",
         "type": "github"
       },
       "original": {

flake.nix

@@ -48,18 +48,26 @@
           inherit src;
           buildInputs = with pkgs;
             [
-              alsa-lib
+              # alsa-lib
               # wayland
               # xorg.libX11
               # xorg.libXi
               # libGL
             ]
             ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
-              libiconv
-              # pkgs.darwin.apple_sdk.frameworks.CoreServices
-              # pkgs.darwin.apple_sdk.frameworks.Security
-              # pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
-              # pkgs.darwin.apple_sdk.frameworks.Foundation
+              pkgs.darwin.apple_sdk.frameworks.Foundation
+              pkgs.darwin.apple_sdk.frameworks.CoreServices
+              pkgs.darwin.apple_sdk.frameworks.Security
+              pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
+              pkgs.darwin.apple_sdk.frameworks.System
+              pkgs.darwin.apple_sdk.frameworks.ImageIO
+              pkgs.darwin.apple_sdk.frameworks.AppKit
+              pkgs.darwin.apple_sdk.frameworks.Vision
+              pkgs.darwin.apple_sdk.frameworks.CoreGraphics
+              pkgs.darwin.apple_sdk.frameworks.Metal
+              pkgs.darwin.apple_sdk.frameworks.AVFoundation
+              pkgs.darwin.apple_sdk.frameworks.MetalKit
+              # "-lsystem" "-framework" "Foundation" "-framework" "ImageIO" "-framework" "AppKit" "-framework" "Vision" "-framework" "CoreGraphics" "-framework" "Metal" "-framework" "AVFoundation" "-framework" "CoreMidi" "-framework" "MetalKit" "-lobjc" "-liconv" "-lSystem" "-lc" "-lm"
             ]; # Inputs required for the TARGET system
 
           nativeBuildInputs = with pkgs; [
@@ -70,12 +78,6 @@
           # LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
           # For using pkg-config that many libraries require
           # PKG_CONFIG_PATH = lib.makeSearchPath "lib/pkgconfig" (with pkgs;[ openssl.dev zlib.dev ]);
-          LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
-            "${pkgs.xorg.libX11}/lib"
-            "${pkgs.xorg.libXi}/lib"
-            "${pkgs.libGL}/lib"
-            "${pkgs.wayland}/lib"
-          ];
         };
         cargoArtifacts = craneLib.buildDepsOnly commonArgs;
       in {
@@ -96,15 +98,16 @@
             });
         };
         packages = rec {
-          tadventure-unwrapped = pkgs.rustPlatform.buildRustPackage {
+          tadventure-unwrapped = craneLib.buildPackage ({
               pname = "tadventure";
               version = "0.1.0";
-            cargoLock = {
-              lockFile = "${src}/Cargo.lock";
-            };
-            inherit src;
-          };
-          tadventure = pkgs.buildFHSEnv {
+              inherit src cargoArtifacts;
+            }
+            // commonArgs);
+          tadventure =
+            if pkgs.stdenv.isLinux
+            then
+              (pkgs.buildFHSEnv {
                 name = "tadventure";
                 targetPkgs = pkgs:
                   with pkgs; [
@@ -121,7 +124,8 @@
                 runScript = ''
                   ${tadventure-unwrapped}/bin/tadventure
                 '';
-          };
+              })
+            else tadventure-unwrapped;
           default = tadventure;
         };
 
@@ -134,6 +138,14 @@
               cargo-criterion
               trunk
             ];
+          }
+          // lib.optionalAttrs (pkgs.stdenv.isLinux) {
+            LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
+              "${pkgs.xorg.libX11}/lib"
+              "${pkgs.xorg.libXi}/lib"
+              "${pkgs.libGL}/lib"
+              "${pkgs.wayland}/lib"
+            ];
           });
       }
     );

src/main.rs

@@ -60,14 +60,6 @@ impl Character {
 
     pub fn draw(&self) {
         draw_circle(self.pos.x, self.pos.y, 16.0, BLUE);
-        draw_line(
-            self.pos.x,
-            self.pos.y,
-            self.pointing.x,
-            self.pointing.y,
-            5.0,
-            RED,
-        );
     }
 
     pub fn move_with_velocity(&mut self) {