From 1f12544179041b151f146fbb604e9af165ffe379 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 3 Aug 2020 19:05:29 +0100 Subject: refactor(3p/nix): Build nix-daemon as a separate binary Skips over all the monobinary stuff and moves to a separate binary for nix-daemon. This also replaces the flag parsing logic with absl::flags. This causes a behaviour change for --help, which no longer tries to display a man page but instead shows the actual command-line help. Note: This binary no longer links to the Boehm GC. Change-Id: Ib852e994b82f2d56e91262878c10650e656427a9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1622 Tested-by: BuildkiteCI Reviewed-by: glittershark --- third_party/nix/src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'third_party/nix/src/CMakeLists.txt') diff --git a/third_party/nix/src/CMakeLists.txt b/third_party/nix/src/CMakeLists.txt index a142bfafb463..486c69fa2a3c 100644 --- a/third_party/nix/src/CMakeLists.txt +++ b/third_party/nix/src/CMakeLists.txt @@ -10,6 +10,7 @@ add_subdirectory(libutil) add_subdirectory(libstore) add_subdirectory(libmain) add_subdirectory(libexpr) +add_subdirectory(nix-daemon) if (PACKAGE_TESTS) add_subdirectory(tests) @@ -61,8 +62,6 @@ target_sources(nix nix-channel/nix-channel.cc nix-collect-garbage/nix-collect-garbage.cc nix-copy-closure/nix-copy-closure.cc - nix-daemon/nix-daemon-proto.cc - nix-daemon/nix-daemon-main.cc nix-env/nix-env.cc nix-env/user-env.cc nix-instantiate/nix-instantiate.cc -- cgit 1.4.1