Skip to content

Commit

Permalink
fix(ci: build): manually build instead of nix build
Browse files Browse the repository at this point in the history
This should be temporary, until we find a way to download git submodules
(criterion) inside the nix derivation since it breaks meson currently
(and that I really don't want to deal with meson nor nix rn).
  • Loading branch information
d4ilyrun committed May 8, 2024
1 parent 9a62281 commit 4c01430
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@ jobs:
- name: Build Kernel
run: |
nix build .#kernel -L
nix develop --command ninja -C build kernel
- name: Build ISO
run: |
nix develop --command ninja -C build iso
5 changes: 5 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@

buildInputs = [ pkgs.pkgsi686Linux.glibc ];
hardeningDisable = [ "fortify" ];

shellHook = ''
export BUILD_DIR=build
meson setup --cross-file ./scripts/meson_cross.ini --reconfigure -Dbuildtype=debug "./$BUILD_DIR"
'';
};

test = pkgs.mkShell rec {
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ run_target('qemu',

if get_option('buildtype') == 'debug'

gdb = find_program('gdb')
gdb = find_program('gdb', false)

# We need to use a custom target to be able to daemonize appropriately
custom_target('qemu-server',
Expand Down

0 comments on commit 4c01430

Please sign in to comment.