diff options
| author | andromeda <andromeda@lenovo> | 2026-03-03 18:18:57 +0100 |
|---|---|---|
| committer | andromeda <andromeda@lenovo> | 2026-03-03 18:18:57 +0100 |
| commit | d879df630f68bb56f291ac285f951ca2ba6764e7 (patch) | |
| tree | baf7f8f71dfdef788e1cbc032268c58d1dd9e8b1 | |
| parent | ab30c236003a8dafd148d821dbe559202446b0d7 (diff) | |
reorganise
| -rw-r--r-- | asm/boot.asm (renamed from boot.asm) | 0 | ||||
| -rw-r--r-- | asm/kernel.asm (renamed from kernel.asm) | 0 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | nix/package.nix (renamed from package.nix) | 6 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kernel.asm b/asm/kernel.asm index 23c0d5d..23c0d5d 100644 --- a/kernel.asm +++ b/asm/kernel.asm @@ -10,7 +10,7 @@ system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { - packages.${system}.default = pkgs.callPackage ./package.nix {}; + packages.${system}.default = pkgs.callPackage ./nix/package.nix {}; devShells.${system}.default = pkgs.mkShell { inputsFrom = [self.packages.${system}.default]; }; diff --git a/package.nix b/nix/package.nix index 1cef31a..3d56a51 100644 --- a/package.nix +++ b/nix/package.nix @@ -9,10 +9,10 @@ in stdenv.mkDerivation { pname = "bootler"; version = "0.1.0"; - src = ./.; + src = ../.; buildPhase = '' - ${nasm}/bin/nasm boot.asm -o boot.bin - ${nasm}/bin/nasm kernel.asm -o kernel.bin + ${nasm}/bin/nasm asm/boot.asm -o boot.bin + ${nasm}/bin/nasm asm/kernel.asm -o kernel.bin dd if=/dev/zero of=${bootImg} bs=512 count=2 dd if=boot.bin of=${bootImg} conv=notrunc |