build: meson for libfetchers

This commit is contained in:
Tom Bereknyei 2024-06-05 21:36:18 -04:00 committed by John Ericson
parent 6e34c68327
commit 706edf26eb
8 changed files with 266 additions and 2 deletions

View file

@ -180,6 +180,15 @@
busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell; busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
}; };
nix-fetchers = final.callPackage ./src/libfetchers/package.nix {
inherit
fileset
stdenv
officialRelease
versionSuffix
;
};
nix = nix =
final.callPackage ./package.nix { final.callPackage ./package.nix {
inherit inherit
@ -288,6 +297,7 @@
# system, we should reenable these. # system, we should reenable these.
#"nix-util" = { }; #"nix-util" = { };
#"nix-store" = { }; #"nix-store" = { };
#"nix-fetchers" = { };
"nix-internal-api-docs" = { }; "nix-internal-api-docs" = { };
} }
// lib.optionalAttrs (builtins.elem system linux64BitSystems) { // lib.optionalAttrs (builtins.elem system linux64BitSystems) {
@ -351,12 +361,14 @@
mesonFlags = mesonFlags =
map (transformFlag "libutil") pkgs.nix-util.mesonFlags map (transformFlag "libutil") pkgs.nix-util.mesonFlags
++ map (transformFlag "libstore") pkgs.nix-store.mesonFlags ++ map (transformFlag "libstore") pkgs.nix-store.mesonFlags
++ map (transformFlag "libfetchers") pkgs.nix-fetchers.mesonFlags
++ lib.optionals havePerl (map (transformFlag "perl") pkgs.nix-perl-bindings.mesonFlags) ++ lib.optionals havePerl (map (transformFlag "perl") pkgs.nix-perl-bindings.mesonFlags)
; ;
nativeBuildInputs = attrs.nativeBuildInputs or [] nativeBuildInputs = attrs.nativeBuildInputs or []
++ pkgs.nix-util.nativeBuildInputs ++ pkgs.nix-util.nativeBuildInputs
++ pkgs.nix-store.nativeBuildInputs ++ pkgs.nix-store.nativeBuildInputs
++ pkgs.nix-fetchers.nativeBuildInputs
++ lib.optionals havePerl pkgs.nix-perl-bindings.nativeBuildInputs ++ lib.optionals havePerl pkgs.nix-perl-bindings.nativeBuildInputs
++ [ ++ [
modular.pre-commit.settings.package modular.pre-commit.settings.package

View file

@ -37,6 +37,7 @@ let
"nix" "nix"
"nix-util" "nix-util"
"nix-store" "nix-store"
"nix-fetchers"
]; ];
in in
{ {

View file

@ -8,5 +8,6 @@ project('nix-dev-shell', 'cpp',
subproject('libutil') subproject('libutil')
subproject('libstore') subproject('libstore')
subproject('libfetchers')
subproject('perl') subproject('perl')
subproject('internal-api-docs') subproject('internal-api-docs')

1
src/libfetchers/.version Symbolic link
View file

@ -0,0 +1 @@
../../.version

141
src/libfetchers/meson.build Normal file
View file

@ -0,0 +1,141 @@
project('nix-fetchers', 'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'debug=true',
'optimization=2',
'errorlogs=true', # Please print logs for tests that fail
],
meson_version : '>= 1.1',
license : 'LGPL-2.1-or-later',
)
cxx = meson.get_compiler('cpp')
# See note in ../nix-util/meson.build
deps_private = [ ]
# See note in ../nix-util/meson.build
deps_public = [ ]
# 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
nlohmann_json = dependency('nlohmann_json', version : '>= 3.9')
deps_public += nlohmann_json
libgit2 = dependency('libgit2')
deps_public += libgit2
add_project_arguments(
# TODO(Qyriad): Yes this is how the autoconf+Make system did it.
# It would be nice for our headers to be idempotent instead.
'-include', 'config-util.h',
'-include', 'config-store.h',
# '-include', 'config-fetchers.h',
'-Wno-deprecated-declarations',
'-Wimplicit-fallthrough',
'-Werror=switch',
'-Werror=switch-enum',
'-Wdeprecated-copy',
'-Wignored-qualifiers',
# Enable assertions in libstdc++ by default. Harmless on libc++. Benchmarked
# at ~1% overhead in `nix search`.
#
# FIXME: remove when we get meson 1.4.0 which will default this to on for us:
# https://mesonbuild.com/Release-notes-for-1-4-0.html#ndebug-setting-now-controls-c-stdlib-assertions
'-D_GLIBCXX_ASSERTIONS=1',
language : 'cpp',
)
sources = files(
'attrs.cc',
'cache.cc',
'fetch-settings.cc',
'fetch-to-store.cc',
'fetchers.cc',
'filtering-source-accessor.cc',
'git.cc',
'git-utils.cc',
'github.cc',
'indirect.cc',
'mercurial.cc',
'mounted-source-accessor.cc',
'path.cc',
'store-path-accessor.cc',
'registry.cc',
'tarball.cc',
)
headers = files(
'attrs.hh',
'cache.hh',
'fetch-settings.hh',
'fetch-to-store.hh',
'filtering-source-accessor.hh',
'git-utils.hh',
'mounted-source-accessor.hh',
'fetchers.hh',
'registry.hh',
'store-path-accessor.hh',
'tarball.hh',
)
this_library = library(
'nixfetchers',
sources,
dependencies : deps_public + deps_private + deps_other,
install : true,
)
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
requires += deps_public
import('pkgconfig').generate(
this_library,
filebase : meson.project_name(),
name : 'Nix',
description : 'Nix Package Manager',
subdirs : ['nix'],
extra_cflags : ['-std=c++2a'],
requires : requires,
requires_private : deps_private,
)
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],
))

106
src/libfetchers/package.nix Normal file
View file

@ -0,0 +1,106 @@
{ lib
, stdenv
, releaseTools
, fileset
, meson
, ninja
, pkg-config
, nix-util
, nix-store
, nlohmann_json
, libgit2
, man
# Configuration Options
, versionSuffix ? ""
, officialRelease ? false
# Check test coverage of Nix. Probably want to use with with at least
# one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false
# Avoid setting things that would interfere with a functioning devShell
, forDevShell ? false
}:
let
version = lib.fileContents ./.version + versionSuffix;
mkDerivation =
if withCoverageChecks
then
# TODO support `finalAttrs` args function in
# `releaseTools.coverageAnalysis`.
argsFun:
releaseTools.coverageAnalysis (let args = argsFun args; in args)
else stdenv.mkDerivation;
in
mkDerivation (finalAttrs: {
pname = "nix-fetchers";
inherit version;
src = fileset.toSource {
root = ./.;
fileset = fileset.unions [
./meson.build
(fileset.fileFilter (file: file.hasExt "cc") ./.)
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
libgit2
];
propagatedBuildInputs = [
nix-store
nix-util
nlohmann_json
];
preConfigure =
# "Inline" .version so its not a symlink, and includes the suffix
''
echo ${version} > .version
'';
env = lib.optionalAttrs (stdenv.isLinux && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux")) {
LDFLAGS = "-fuse-ld=gold";
};
enableParallelBuilding = true;
postInstall =
# Remove absolute path to boost libs
''
'';
separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO `releaseTools.coverageAnalysis` in Nixpkgs needs to be updated
# to work with `strictDeps`.
strictDeps = !withCoverageChecks;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows;
};
} // lib.optionalAttrs withCoverageChecks {
lcovFilter = [ "*-tab.*" ];
hardeningDisable = ["fortify"];
})

View file

@ -425,12 +425,13 @@ this_library = library(
install_headers(headers, subdir : 'nix', preserve_path : true) install_headers(headers, subdir : 'nix', preserve_path : true)
requires = deps_public requires = []
if nix_util.type_name() == 'internal' if nix_util.type_name() == 'internal'
# `requires` cannot contain declared dependencies (from the # `requires` cannot contain declared dependencies (from the
# subproject), so we need to do this manually # subproject), so we need to do this manually
requires = [ 'nix-util' ] + requires requires += 'nix-util'
endif endif
requires += deps_public
import('pkgconfig').generate( import('pkgconfig').generate(
this_library, this_library,

View file

@ -72,6 +72,7 @@ mkDerivation (finalAttrs: {
; ;
propagatedBuildInputs = [ propagatedBuildInputs = [
boost.dev
libarchive libarchive
nlohmann_json nlohmann_json
]; ];