add nix config

2025-02-25 16:24:07 -05:00 · 2025-02-25 16:24:07 -05:00 · ce2b373313
parent f6b3c2dc50
commit ce2b373313
4 changed files with 15 additions and 3 deletions
--- a/.envrc
+++ b/.envrc
@ -0,0 +1 @@
+use nix
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 .cache/
 build/
 iso/boot/kernel.elf
+.direnv/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -24,9 +24,9 @@ FILE(GLOB SOURCES kernel/kernel.c)

 # Architecture Specific Files
 if (ARCH STREQUAL "i386")
-    set(CMAKE_C_COMPILER i386-elf-gcc)
-    set(CMAKE_ASM_COMPILER i386-elf-as)
-    set(LD i386-elf-gcc)
+    set(CMAKE_C_COMPILER i686-elf-gcc)
+    set(CMAKE_ASM_COMPILER i686-elf-as)
+    set(LD i686-elf-gcc)
    FILE(GLOB ASM_SOURCES arch/i386/*.s)
    SET(ARCH_FLAG "-DARCH_I386")
 endif()
--- a/shell.nix
+++ b/shell.nix
@ -0,0 +1,10 @@
+let
+  pkgs' = (import <nixpkgs> {}).pkgsCross.i686-embedded;
+  pkgs = (import <nixpkgs> {});
+in
+  pkgs'.mkShell {
+    nativeBuildInputs = [ 
+        pkgs.cdrkit
+        pkgs.qemu
+    ];
+}