mirror of
https://github.com/NixOS/nix
synced 2025-06-25 10:41:16 +02:00
Expose the nix component in header include paths
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
This commit is contained in:
parent
4de73df8bf
commit
cc24766fa6
647 changed files with 2566 additions and 2568 deletions
|
@ -1,6 +1,6 @@
|
|||
#include "nix/experimental-features.hh"
|
||||
#include "nix/fmt.hh"
|
||||
#include "nix/util.hh"
|
||||
#include "nix/util/experimental-features.hh"
|
||||
#include "nix/util/fmt.hh"
|
||||
#include "nix/util/util.hh"
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue