qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

conservatively introduce fmtlib (fmt migration take II)

Browse source 
Instead of trying juggle nix::fmt and fmt::, we'll just rename the fmt
namespace.

Change-Id: Iba51166a8f04386f1b13e506edfc462ef0d12928
This commit is contained in:
Qyriad 2024-07-03 00:07:20 -06:00
parent 45ac449d39
commit 2fc9c64131
4 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -297,6 +297,8 @@ pegtl = dependency(
nlohmann_json = dependency('nlohmann_json', required : true) nlohmann_json = dependency('nlohmann_json', required : true)
fmt = dependency('fmt', required : true)
# lix-doc is a Rust project provided via buildInputs and unfortunately doesn't have any way to be detected. # lix-doc is a Rust project provided via buildInputs and unfortunately doesn't have any way to be detected.
# Just declare it manually to resolve this. # Just declare it manually to resolve this.
# #

2
package.nix
View file

@ -20,6 +20,7 @@
doxygen, doxygen,
editline-lix ? __forDefaults.editline-lix, editline-lix ? __forDefaults.editline-lix,
editline, editline,
fmt,
git, git,
gtest, gtest,
jq, jq,
@ -246,6 +247,7 @@ stdenv.mkDerivation (finalAttrs: {
sqlite sqlite
libarchive libarchive
boost boost
fmt
lowdown lowdown
libsodium libsodium
toml11 toml11

1
src/libutil/fmt.hh
View file

@ -10,6 +10,7 @@
#define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
#endif #endif
#include <boost/stacktrace.hpp> #include <boost/stacktrace.hpp>
#include "ansicolor.hh" #include "ansicolor.hh"
namespace nix { namespace nix {

1
src/libutil/meson.build
View file

@ -122,6 +122,7 @@ libutil = library(
aws_s3, aws_s3,
boehm, boehm,
boost, boost,
fmt,
cpuid, cpuid,
seccomp, seccomp,
libarchive, libarchive,