reorganise
This commit is contained in:
@@ -10,7 +10,7 @@
|
|||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
packages.${system}.default = pkgs.callPackage ./package.nix {};
|
packages.${system}.default = pkgs.callPackage ./nix/package.nix {};
|
||||||
devShells.${system}.default = pkgs.mkShell {
|
devShells.${system}.default = pkgs.mkShell {
|
||||||
inputsFrom = [self.packages.${system}.default];
|
inputsFrom = [self.packages.${system}.default];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ in
|
|||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "bootler";
|
pname = "bootler";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
src = ./.;
|
src = ../.;
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
${nasm}/bin/nasm boot.asm -o boot.bin
|
${nasm}/bin/nasm asm/boot.asm -o boot.bin
|
||||||
${nasm}/bin/nasm kernel.asm -o kernel.bin
|
${nasm}/bin/nasm asm/kernel.asm -o kernel.bin
|
||||||
|
|
||||||
dd if=/dev/zero of=${bootImg} bs=512 count=2
|
dd if=/dev/zero of=${bootImg} bs=512 count=2
|
||||||
dd if=boot.bin of=${bootImg} conv=notrunc
|
dd if=boot.bin of=${bootImg} conv=notrunc
|
||||||
Reference in New Issue
Block a user