From 1ede092b3e9e10be80a539952c0790f78dd55f10 Mon Sep 17 00:00:00 2001 From: Yingchi Long Date: Tue, 19 Dec 2023 16:27:04 +0800 Subject: [PATCH] vendor: add fmt dep --- default.nix | 2 ++ libnixf/meson.build | 6 ------ meson.build | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/default.nix b/default.nix index d0e09641c..96728bbe7 100644 --- a/default.nix +++ b/default.nix @@ -3,6 +3,7 @@ , bison , boost182 , flex +, fmt , gtest , libbacktrace , lit @@ -41,6 +42,7 @@ stdenv.mkDerivation { gtest boost182 llvmPackages.llvm + fmt ]; env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h"; diff --git a/libnixf/meson.build b/libnixf/meson.build index d420cfe02..8d5eb644c 100644 --- a/libnixf/meson.build +++ b/libnixf/meson.build @@ -1,11 +1,5 @@ nixf_inc = include_directories('include') -gtest = dependency('gtest') -gtest_main = dependency('gtest_main') -fmt = dependency('fmt') -pkgconfig = import('pkgconfig') -lit = find_program('lit', required: false) - subdir('lib') subdir('test') diff --git a/meson.build b/meson.build index 18c5b2557..6e14fc7eb 100644 --- a/meson.build +++ b/meson.build @@ -31,6 +31,7 @@ gtest_main = dependency('gtest_main') llvm = dependency('llvm') boost = dependency('boost') +fmt = dependency('fmt') cpp = meson.get_compiler('cpp') backtrace = cpp.find_library('backtrace')