Skip to content

Commit

Permalink
fix weird crash
Browse files Browse the repository at this point in the history
  • Loading branch information
Mic92 committed Jan 6, 2025
1 parent 503e3e1 commit 90da38c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
7 changes: 4 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ project('nix-eval-jobs', 'cpp',
)

libcurl_dep = dependency('libcurl', required: true)
nix_main_dep = dependency('nix-main', required: true)
nix_store_dep = dependency('nix-store', required: true)
nix_expr_dep = dependency('nix-expr', required: true)
nix_cmd_dep = dependency('nix-cmd', required: true)
nix_expr_dep = dependency('nix-expr', required: true)
nix_fetchers_dep = dependency('nix-fetchers', required: true)
nix_flake_dep = dependency('nix-flake', required: true)
nix_main_dep = dependency('nix-main', required: true)
nix_store_dep = dependency('nix-store', required: true)
threads_dep = dependency('threads', required: true)
nlohmann_json_dep = dependency('nlohmann_json', required: true)
boost_dep = dependency('boost', required: true)
Expand Down
2 changes: 0 additions & 2 deletions src/drv.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#include <nix/config-store.hh> // IWYU pragma: keep

#include <nix/path-with-outputs.hh>
#include <nix/store-api.hh>
#include <nix/local-fs-store.hh>
Expand Down
11 changes: 10 additions & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,18 @@ executable('nix-eval-jobs', src,
nix_expr_dep,
nix_cmd_dep,
nix_flake_dep,
nix_fetchers_dep,
boost_dep,
nlohmann_json_dep,
threads_dep
],
install: true,
cpp_args: ['-std=c++2a', '--include', 'autotools-config.h'])
cpp_args: [
'-std=c++2a',
'--include', 'autotools-config.h',
'--include', 'nix/config-cmd.hh',
'--include', 'nix/config-expr.hh',
'--include', 'nix/config-main.hh',
'--include', 'nix/config-store.hh',
'--include', 'nix/config-util.hh',
])
2 changes: 0 additions & 2 deletions src/nix-eval-jobs.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#include <nix/config-store.hh> // IWYU pragma: keep

// NOLINTBEGIN(modernize-deprecated-headers)
// misc-include-cleaner wants these header rather than the C++ versions
#include <signal.h>
Expand Down
2 changes: 0 additions & 2 deletions src/worker.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#include <nix/config-store.hh> // IWYU pragma: keep

// doesn't exist on macOS
// IWYU pragma: no_include <bits/types/struct_rusage.h>

Expand Down

0 comments on commit 90da38c

Please sign in to comment.