From 32777f51a472c123ae4b871d1a2be614aa2074c5 Mon Sep 17 00:00:00 2001 From: Patrick Cleavelin Date: Thu, 4 Jan 2024 14:17:20 -0600 Subject: [PATCH] don't just use come hardcoded directory for Odin compiler --- flake.nix | 7 ++++++- src/main.odin | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e7fd793..5c7ff05 100755 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,12 @@ extensions = [ "rust-analysis" ]; }; fixed-odin = pkgs.odin.overrideAttrs (finalAttrs: prevAttr: rec { - src = /Users/temp/Documents/personal/Odin; + src = pkgs.fetchFromGitHub { + owner = "pcleavelin"; + repo = "Odin"; + rev = "59aa05170d54edff75aed220bb1653fc369573d7"; + hash = "sha256-ZMcVugE0uRHba8jmQjTyQ9KKDUdIVSELggKDz9iSiwY="; + }; LLVM_CONFIG = "${pkgs.llvmPackages_17.llvm.dev}/bin/llvm-config"; nativeBuildInputs = with pkgs; prevAttr.nativeBuildInputs ++ [ libcxx libcxxabi ]; postPatch = prevAttr.postPatch + '' diff --git a/src/main.odin b/src/main.odin index bb4593b..a6ddd27 100644 --- a/src/main.odin +++ b/src/main.odin @@ -218,6 +218,7 @@ main :: proc() { raylib.SetTargetFPS(60); raylib.SetExitKey(.KEY_NULL); + // TODO: don't just hard code a MacOS font path state.font = raylib.LoadFontEx("/System/Library/Fonts/Supplemental/Andale Mono.ttf", i32(state.source_font_height*2), nil, 0); raylib.SetTextureFilter(state.font.texture, .BILINEAR); menu_bar_state := ui.MenuBarState{