From 733f3051b15448e491644e3737de0887b2aa7df6 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 15 Apr 2024 19:20:21 +0200 Subject: [PATCH] Fix include paths for Nix headers 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. --- src/eval-args.cc | 7 +++---- src/nix-eval-jobs.cc | 27 ++++++++++++--------------- src/worker.cc | 43 ++++++++++++++++++++----------------------- 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/src/eval-args.cc b/src/eval-args.cc index 5ccf732..0417c31 100644 --- a/src/eval-args.cc +++ b/src/eval-args.cc @@ -1,9 +1,8 @@ #include #include -#include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc index 187c95d..b1b3bd5 100644 --- a/src/nix-eval-jobs.cc +++ b/src/nix-eval-jobs.cc @@ -1,11 +1,10 @@ #include // IWYU pragma: keep -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -13,18 +12,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include +#include +#include #include #include #include diff --git a/src/worker.cc b/src/worker.cc index cb0a7d3..9e8ea2b 100644 --- a/src/worker.cc +++ b/src/worker.cc @@ -3,35 +3,32 @@ // doesn't exist on macOS // IWYU pragma: no_include -#include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include