From 2c38ad2cfaa394b3112326df5145fc62dfce78d6 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Mon, 11 Aug 2025 19:21:53 +0300 Subject: [PATCH] libutil: Include necessary headers in config-impl.hh These headers need to be included before everything else (at least in GCC). --- src/libexpr/eval-profiler-settings.cc | 1 - src/libutil/include/nix/util/config-impl.hh | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libexpr/eval-profiler-settings.cc b/src/libexpr/eval-profiler-settings.cc index 1ee5e9231..57bd6a46d 100644 --- a/src/libexpr/eval-profiler-settings.cc +++ b/src/libexpr/eval-profiler-settings.cc @@ -1,6 +1,5 @@ #include "nix/expr/eval-profiler-settings.hh" #include "nix/util/configuration.hh" -#include "nix/util/logging.hh" /* Needs to be included before config-impl.hh */ #include "nix/util/config-impl.hh" #include "nix/util/abstract-setting-to-json.hh" diff --git a/src/libutil/include/nix/util/config-impl.hh b/src/libutil/include/nix/util/config-impl.hh index f72917b11..f407bc862 100644 --- a/src/libutil/include/nix/util/config-impl.hh +++ b/src/libutil/include/nix/util/config-impl.hh @@ -12,8 +12,10 @@ * instantiation. */ +#include "nix/util/util.hh" #include "nix/util/configuration.hh" #include "nix/util/args.hh" +#include "nix/util/logging.hh" namespace nix {