diff --git a/boot.asm b/asm/boot.asm similarity index 100% rename from boot.asm rename to asm/boot.asm diff --git a/kernel.asm b/asm/kernel.asm similarity index 100% rename from kernel.asm rename to asm/kernel.asm diff --git a/flake.nix b/flake.nix index 6f3484c..79bff22 100644 --- a/flake.nix +++ b/flake.nix @@ -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 similarity index 88% rename from package.nix rename to 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