nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-03 15:40:59 +01:00
Code Activity

Meson build for libexpr and libflake

Browse source
This commit is contained in:
John Ericson 2024-06-26 22:15:33 -04:00
parent fbdc554908
commit 31257009e1
16 changed files with 731 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/libfetchers/meson.build
View file

@ -20,27 +20,24 @@ deps_private = [ ]
# See note in ../nix-util/meson.build
deps_public = [ ]
# See note in ../nix-util/meson.build
deps_public_subproject = [ ]
# See note in ../nix-util/meson.build
deps_other = [ ]
configdata = configuration_data()
nix_util = dependency('nix-util')
if nix_util.type_name() == 'internal'
# subproject sadly no good for pkg-config module
deps_other += nix_util
else
deps_public += nix_util
endif
nix_store = dependency('nix-store')
if nix_store.type_name() == 'internal'
# subproject sadly no good for pkg-config module
deps_other += nix_store
else
deps_public += nix_store
endif
foreach nix_dep : [
dependency('nix-util'),
dependency('nix-store'),
]
if nix_dep.type_name() == 'internal'
deps_public_subproject += nix_dep
# subproject sadly no good for pkg-config module
deps_other += nix_dep
else
deps_public += nix_dep
endif
endforeach
nlohmann_json = dependency('nlohmann_json', version : '>= 3.9')
deps_public += nlohmann_json
@ -113,14 +110,9 @@ this_library = library(
install_headers(headers, subdir : 'nix', preserve_path : true)
requires = []
if nix_util.type_name() == 'internal'
# `requires` cannot contain declared dependencies (from the
# subproject), so we need to do this manually
requires += 'nix-util'
endif
if nix_store.type_name() == 'internal'
requires += 'nix-store'
endif
foreach dep : deps_public_subproject
requires += dep.name()
endforeach
requires += deps_public
import('pkgconfig').generate(
@ -138,5 +130,5 @@ meson.override_dependency(meson.project_name(), declare_dependency(
include_directories : include_directories('.'),
link_with : this_library,
compile_args : ['-std=c++2a'],
dependencies : [nix_util, nix_store],
dependencies : deps_public_subproject + deps_public,
))

7
src/libfetchers/package.nix
View file

@ -38,7 +38,7 @@ let
in
mkDerivation (finalAttrs: {
pname = "nix-fetchers";
pname = "nix-flake";
inherit version;
src = fileset.toSource {
@ -80,11 +80,6 @@ mkDerivation (finalAttrs: {
enableParallelBuilding = true;
postInstall =
# Remove absolute path to boost libs
''
'';
separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated