lix-project/nix-eval-jobs
2
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

Fix include paths for Nix headers

Browse source 
While the previous style seems more sensible to me (the header names
are quite generic), the pkg-config definitions both from upstream Nix
and from Lix specify -I${includedir}/nix in CFLAGS rather than
-I${includedir}. This may be worth changing, but for now I want
nix-eval-jobs to work and this does what I want.
This commit is contained in:
Linus Heckemann 2024-04-15 19:20:21 +02:00
parent 6b03a93296
commit 733f3051b1
3 changed files with 35 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/eval-args.cc
View file

@ -1,9 +1,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <nix/args.hh>
#include <nix/file-system.hh>
#include <nix/flake/flake.hh>
#include <nix/flake/lockfile.hh>
#include <args.hh>
#include <flake/flake.hh>
#include <flake/lockfile.hh>
#include <functional>
#include <map>
#include <memory>

27
src/nix-eval-jobs.cc
View file

@ -1,11 +1,10 @@
#include <nix/config.h> // IWYU pragma: keep
#include <nix/eval-settings.hh>
#include <nix/shared.hh>
#include <nix/sync.hh>
#include <nix/eval.hh>
#include <nix/signals.hh>
#include <nix/terminal.hh>
#include <eval-settings.hh>
#include <shared.hh>
#include <sync.hh>
#include <eval.hh>
#include <signals.hh>
#include <sys/wait.h>
#include <nlohmann/json.hpp>
#include <errno.h>
@ -13,18 +12,16 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <nix/attr-set.hh>
#include <nix/config.hh>
#include <nix/error.hh>
#include <nix/file-descriptor.hh>
#include <nix/globals.hh>
#include <nix/logging.hh>
#include <attr-set.hh>
#include <config.hh>
#include <error.hh>
#include <globals.hh>
#include <logging.hh>
#include <nlohmann/detail/iterators/iter_impl.hpp>
#include <nlohmann/detail/json_ref.hpp>
#include <nlohmann/json_fwd.hpp>
#include <nix/processes.hh>
#include <nix/ref.hh>
#include <nix/store-api.hh>
#include <ref.hh>
#include <store-api.hh>
#include <map>
#include <thread>
#include <condition_variable>

43
src/worker.cc
View file

@ -3,35 +3,32 @@
// doesn't exist on macOS
// IWYU pragma: no_include <bits/types/struct_rusage.h>
#include <nix/terminal.hh>
#include <nix/attr-path.hh>
#include <nix/local-fs-store.hh>
#include <nix/installable-flake.hh>
#include <attr-path.hh>
#include <local-fs-store.hh>
#include <installable-flake.hh>
#include <sys/resource.h>
#include <nlohmann/json.hpp>
#include <stdio.h>
#include <stdlib.h>
#include <nix/attr-set.hh>
#include <nix/canon-path.hh>
#include <nix/common-eval-args.hh>
#include <nix/error.hh>
#include <nix/eval-inline.hh>
#include <nix/eval.hh>
#include <nix/file-descriptor.hh>
#include <nix/file-system.hh>
#include <nix/flake/flakeref.hh>
#include <nix/get-drvs.hh>
#include <nix/input-accessor.hh>
#include <nix/logging.hh>
#include <nix/nixexpr.hh>
#include <attr-set.hh>
#include <canon-path.hh>
#include <common-eval-args.hh>
#include <error.hh>
#include <eval-inline.hh>
#include <eval.hh>
#include <flake/flakeref.hh>
#include <get-drvs.hh>
#include <input-accessor.hh>
#include <logging.hh>
#include <nixexpr.hh>
#include <nlohmann/detail/json_ref.hpp>
#include <nlohmann/json_fwd.hpp>
#include <nix/ref.hh>
#include <nix/store-api.hh>
#include <nix/symbol-table.hh>
#include <nix/types.hh>
#include <nix/util.hh>
#include <nix/value.hh>
#include <ref.hh>
#include <store-api.hh>
#include <symbol-table.hh>
#include <types.hh>
#include <util.hh>
#include <value.hh>
#include <exception>
#include <map>
#include <memory>