packaging: fix dependencies

A bunch of dependencies were superfluous, while others were missing (in
particular on internal sub-libraries) and things just happened to work because
they leaked in or were explicitly required in other places. Make efforts to fix
them all.

Change-Id: I6a6a69643e35ac4b0b66a72f4e42a2ba5ed52488

lix/libcmd/meson.build

@@ -43,15 +43,16 @@ libcmd = library(
   dependencies : [
     liblixutil,
     liblixstore,
-    liblixexpr,
     liblixfetchers,
+    liblixexpr,
     liblixmain,
-    ncurses,
-    editline,
-    lowdown,
-    nlohmann_json,
     liblix_doc,
+    boehm,
+    editline,
     kj,
+    lowdown,
+    ncurses,
+    nlohmann_json,
   ],
   # '../..' for self references like "lix/libcmd/*.hh"
   include_directories : [ '../..' ],
@@ -72,6 +73,11 @@ custom_target(
 
 liblixcmd = declare_dependency(
   include_directories : include_directories('../..'),
+  dependencies : [
+    liblixutil,
+    liblixstore,
+    kj,
+  ],
   link_with : libcmd,
 )
 meson.override_dependency('lix-cmd', liblixcmd)

lix/libexpr/meson.build

@@ -276,9 +276,9 @@ dependencies = [
   liblixfetchers,
   boehm,
   boost,
-  toml11,
-  nlohmann_json,
   kj,
+  nlohmann_json,
+  toml11,
 ]
 
 libexpr_temp = library(
@@ -333,8 +333,12 @@ install_headers(
 liblixexpr = declare_dependency(
   include_directories : include_directories('../..'),
   sources : libexpr_settings_header,
-  # Parallels the requirement to link with boehm of the pkg-config but for internal targets.
-  dependencies : [boehm],
+  dependencies : [
+    liblixutil,
+    liblixfetchers,
+    boehm,
+    boost,
+  ],
   link_with : libexpr,
 )
 

lix/libfetchers/meson.build

@@ -49,8 +49,8 @@ libfetchers_settings_header = custom_target(
 dependencies = [
   liblixstore,
   liblixutil,
-  nlohmann_json,
   kj,
+  nlohmann_json,
 ]
 
 libfetchers_temp = library(
@@ -109,6 +109,11 @@ configure_file(
 liblixfetchers = declare_dependency(
   include_directories : include_directories('../..'),
   sources : libfetchers_settings_header,
+  dependencies : [
+    liblixutil,
+    liblixstore,
+    kj,
+  ],
   link_with : libfetchers,
 )
 

lix/libmain/meson.build

@@ -21,6 +21,7 @@ libmain = library(
   dependencies : [
     liblixutil,
     liblixstore,
+    boost,
     kj,
   ],
   include_directories : [ '../..' ],
@@ -34,6 +35,9 @@ install_headers(libmain_headers, subdir : 'lix/libmain', preserve_path : true)
 
 liblixmain = declare_dependency(
   include_directories : include_directories('../..'),
+  dependencies : [
+    liblixutil,
+  ],
   link_with : libmain,
 )
 meson.override_dependency('lix-main', liblixmain)

lix/libstore/meson.build

@@ -383,19 +383,19 @@ foreach name, value : cpp_str_defines
 endforeach
 
 dependencies = [
-  libarchive,
   liblixutil, # Internal.
-  seccomp,
-  sqlite,
-  sodium,
-  curl,
-  openssl,
-  aws_sdk,
   aws_s3,
+  aws_sdk,
   aws_sdk_transfer,
-  nlohmann_json,
-  kj,
+  boost,
   capnp_rpc,
+  curl,
+  kj,
+  libarchive,
+  nlohmann_json,
+  seccomp,
+  sodium,
+  sqlite,
 ]
 
 if host_machine.system() == 'freebsd'
@@ -449,6 +449,10 @@ install_headers(libstore_headers, subdir : 'lix/libstore', preserve_path : true)
 liblixstore = declare_dependency(
   include_directories : include_directories('../..'),
   sources : libstore_settings_headers,
+  dependencies : [
+    liblixutil,
+    kj,
+  ],
   link_with : libstore,
 )
 

lix/libutil/meson.build

@@ -324,18 +324,13 @@ foreach rpc : libutil_rpc
 endforeach
 
 dependencies = [
-  aws_sdk,
-  aws_s3,
-  boehm,
   boost,
-  cpuid,
-  seccomp,
-  libarchive,
   brotli,
-  openssl,
-  nlohmann_json,
+  cpuid,
   kj,
-  capnp_rpc,
+  libarchive,
+  nlohmann_json,
+  openssl,
 ]
 
 libutil_temp = library(
@@ -411,7 +406,7 @@ liblixutil = declare_dependency(
     # lix-base pkg-config externally)
     kj,
     libarchive,
-    capnp_rpc,
+    nlohmann_json,
   ],
   link_with : libutil
 )

lix/nix/meson.build

@@ -168,16 +168,16 @@ nix = executable(
   include_directories : legacy_include_directories,
   dependencies : [
     libasanoptions,
-    liblixcmd,
     liblixutil,
     liblixstore,
-    liblixexpr,
     liblixfetchers,
+    liblixexpr,
     liblixmain,
+    liblixcmd,
     boehm,
+    capnp_rpc,
     nlohmann_json,
     kj,
-    capnp_rpc,
   ],
   cpp_pch : cpp_pch,
   install : true,