mirror of
https://github.com/NixOS/nix
synced 2025-06-27 16:51:15 +02:00
cc24766fa6
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
89 lines
1.8 KiB
Nix
89 lines
1.8 KiB
Nix
{
|
|
lib,
|
|
stdenv,
|
|
mkMesonLibrary,
|
|
|
|
bison,
|
|
flex,
|
|
cmake, # for resolving toml11 dep
|
|
|
|
nix-util,
|
|
nix-store,
|
|
nix-fetchers,
|
|
boost,
|
|
boehmgc,
|
|
nlohmann_json,
|
|
toml11,
|
|
|
|
# Configuration Options
|
|
|
|
version,
|
|
|
|
# Whether to use garbage collection for the Nix language evaluator.
|
|
#
|
|
# If it is disabled, we just leak memory, but this is not as bad as it
|
|
# sounds so long as evaluation just takes places within short-lived
|
|
# processes. (When the process exits, the memory is reclaimed; it is
|
|
# only leaked *within* the process.)
|
|
#
|
|
# Temporarily disabled on Windows because the `GC_throw_bad_alloc`
|
|
# symbol is missing during linking.
|
|
enableGC ? !stdenv.hostPlatform.isWindows,
|
|
}:
|
|
|
|
let
|
|
inherit (lib) fileset;
|
|
in
|
|
|
|
mkMesonLibrary (finalAttrs: {
|
|
pname = "nix-expr";
|
|
inherit version;
|
|
|
|
workDir = ./.;
|
|
fileset = fileset.unions [
|
|
../../nix-meson-build-support
|
|
./nix-meson-build-support
|
|
../../.version
|
|
./.version
|
|
./meson.build
|
|
./meson.options
|
|
./primops/meson.build
|
|
./include/nix/expr/meson.build
|
|
(fileset.fileFilter (file: file.hasExt "cc") ./.)
|
|
(fileset.fileFilter (file: file.hasExt "hh") ./.)
|
|
./lexer.l
|
|
./parser.y
|
|
(fileset.difference (fileset.fileFilter (file: file.hasExt "nix") ./.) ./package.nix)
|
|
];
|
|
|
|
nativeBuildInputs = [
|
|
bison
|
|
flex
|
|
cmake
|
|
];
|
|
|
|
buildInputs = [
|
|
toml11
|
|
];
|
|
|
|
propagatedBuildInputs = [
|
|
nix-util
|
|
nix-store
|
|
nix-fetchers
|
|
] ++ finalAttrs.passthru.externalPropagatedBuildInputs;
|
|
|
|
# Hack for sake of the dev shell
|
|
passthru.externalPropagatedBuildInputs = [
|
|
boost
|
|
nlohmann_json
|
|
] ++ lib.optional enableGC boehmgc;
|
|
|
|
mesonFlags = [
|
|
(lib.mesonEnable "gc" enableGC)
|
|
];
|
|
|
|
meta = {
|
|
platforms = lib.platforms.unix ++ lib.platforms.windows;
|
|
};
|
|
|
|
})
|