wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

Expose the nix component in header include paths

Browse source 
For example, instead of doing

    #include "nix/store-config.hh"
    #include "nix/derived-path.hh"

Now do

    #include "nix/store/config.hh"
    #include "nix/store/derived-path.hh"

This was originally planned in the issue, and also recent requested by
Eelco.

Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.

Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!

Progress on #7876

(cherry picked from commit cc24766fa6)
This commit is contained in:
John Ericson 2025-03-31 16:38:20 -04:00
parent 64fb6ab435
commit 0c67777396
645 changed files with 2562 additions and 2562 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr-c/nix_api_expr.cc
View file

@ -2,11 +2,11 @@
#include <stdexcept>
#include <string>
#include "nix/eval.hh"
#include "nix/eval-gc.hh"
#include "nix/globals.hh"
#include "nix/eval-settings.hh"
#include "nix/ref.hh"
#include "nix/expr/eval.hh"
#include "nix/expr/eval-gc.hh"
#include "nix/store/globals.hh"
#include "nix/expr/eval-settings.hh"
#include "nix/util/ref.hh"
#include "nix_api_expr.h"
#include "nix_api_expr_internal.h"