diff --git a/.gitignore b/.gitignore
index 5f402dbc3e0..4a32b9b572c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ Makefile.config
 perl/Makefile.config
 
 # /
+/build
 /aclocal.m4
 /autom4te.cache
 /precompiled-headers.h.gch
diff --git a/dependencies/aws-sdk-cpp/meson.build b/dependencies/aws-sdk-cpp/meson.build
index 88c6bb28e1b..ddae615a706 100644
--- a/dependencies/aws-sdk-cpp/meson.build
+++ b/dependencies/aws-sdk-cpp/meson.build
@@ -4,20 +4,30 @@
 
 # Look for aws-cpp-sdk, an optional dependency
 #--------------------------------------------------
-if get_option('with_s3')
+s3_deps = [
+    dependency('aws-cpp-sdk-core', required: get_option('with_s3')),
+    dependency('aws-cpp-sdk-s3', required: get_option('with_s3')),
+    dependency('aws-cpp-sdk-transfer', required: get_option('with_s3'))
+]
 
-    has_s3client = meson.get_compiler('cpp').check_header('aws/s3/S3Client.h')
+have_s3 = true
+foreach d : s3_deps
+    have_s3 = have_s3 and d.found()
+endforeach
 
-    aws_version = meson.get_compiler('cpp').get_define(
-        'AWS_SDK_VERSION_STRING',
-        prefix : '#include <aws/core/VersionConfig.h>'
-    ).strip('"').split('.')
+aws_sdk_cpp_dep = declare_dependency(dependencies : s3_deps)
+
+config_h.set(
+    'ENABLE_S3',
+    have_s3.to_int(),
+    description : 'Whether to enable S3 support via aws-sdk-cpp.')
+
+if have_s3
 
-    aws_sdk_cpp_dep = declare_dependency(
-        dependencies : [
-            dependency('aws-cpp-sdk-core'),
-            dependency('aws-cpp-sdk-s3'),
-            dependency('aws-cpp-sdk-transfer')])
+    has_s3client = cpp.check_header(
+        'aws/s3/S3Client.h',
+        dependencies: aws_sdk_cpp_dep,
+    )
 
     if has_s3client
         config_h.set(
@@ -25,6 +35,12 @@ if get_option('with_s3')
             description : 'Whether to enable S3 support via aws-sdk-cpp.')
     endif
 
+    aws_version = cpp.get_define(
+        'AWS_SDK_VERSION_STRING',
+        prefix : '#include <aws/core/VersionConfig.h>',
+        dependencies: aws_sdk_cpp_dep,
+    ).strip('"').split('.')
+
     config_h.set(
         'AWS_VERSION_MAJOR', aws_version[0],
         description : 'Major version of aws-sdk-cpp.')
@@ -36,9 +52,4 @@ if get_option('with_s3')
         'AWS_VERSION_PATCH', aws_version[2],
         description : 'Patch version of aws-sdk-cpp.')
 
-else
-    aws_sdk_cpp_dep = dependency('', required: false)
-    config_h.set(
-        'ENABLE_S3', 0,
-        description : 'Whether to enable S3 support via aws-sdk-cpp.')
 endif
diff --git a/dependencies/bdw-gc/meson.build b/dependencies/bdw-gc/meson.build
index 008c6480f30..d6e260b1842 100644
--- a/dependencies/bdw-gc/meson.build
+++ b/dependencies/bdw-gc/meson.build
@@ -4,11 +4,7 @@
 
 # Look for Boehm garbage collector, an optional dependency
 #--------------------------------------------------
-if get_option('enable_gc')
-    gc_dep = dependency('bdw-gc')
-else
-    gc_dep = dependency('', required: false)
-endif
+gc_dep = dependency('bdw-gc', required: get_option('enable_gc'))
 
 
 config_h.set(
diff --git a/dependencies/boost/meson.build b/dependencies/boost/meson.build
index 573fca1eaa0..7de84556a2b 100644
--- a/dependencies/boost/meson.build
+++ b/dependencies/boost/meson.build
@@ -7,7 +7,8 @@
 boost_mod_list = [
   'system',
   'context',
-  'thread']
+  'thread',
+]
 
 
 boost_dep = dependency(
diff --git a/dependencies/editline/meson.build b/dependencies/editline/meson.build
index 916faa26c1e..bf0923f331d 100644
--- a/dependencies/editline/meson.build
+++ b/dependencies/editline/meson.build
@@ -11,14 +11,17 @@
 
 editline_dep = cpp.find_library('editline')
 
-if (cpp.has_header('editline.h'))
-    config_h.set(
-        'HAVE_EDITLINE_H', 1,
-        description : 'Define to 1 if you have the <editline.h> header file.')
-else
+if not (
+    cpp.has_header(
+        'editline.h',
+        dependencies : editline_dep))
     error('Nix requires editline.h; however the header was not found.')
 endif
 
+config_h.set(
+    'HAVE_EDITLINE_H', 1,
+    description : 'Define to 1 if you have the <editline.h> header file.')
+
 if not (
     cpp.has_function(
         'read_history',
diff --git a/dependencies/sodium/meson.build b/dependencies/sodium/meson.build
index cc03dc5b6a4..efb1a0271ac 100644
--- a/dependencies/sodium/meson.build
+++ b/dependencies/sodium/meson.build
@@ -4,6 +4,9 @@
 # FIXME !! sodium is seemingly a required dependency for building, but 
 # it isn't listed anywhere on documentation that i could find. dependency
 # object needs to be added to meson.
+#
+# 0df69d96e02ce4c9e17bd33333c5d78313341dd3 made it required but docs were not
+# updated.
 
 # look for libsodium, a required dependency
 #--------------------------------------------------
diff --git a/meson.build b/meson.build
index b307462ef6d..386c07d3075 100644
--- a/meson.build
+++ b/meson.build
@@ -10,15 +10,17 @@
 #-------------------------------------------------
 project(
     'nix',
-    ['cpp', 'rust'],
+    'cpp',
     meson_version : '>= 0.57.0',
     default_options : [
         'cpp_std=c++17',
         'warning_level=3',
         'optimization=3',
-        'debug=true'],
+        'debug=true'
+    ],
     version : files('.version'),
-    license : 'MIT')
+    license : 'MIT',
+)
 
 
 # init compiler 
@@ -226,8 +228,8 @@ project_dirs = [
     'scripts',
     #'misc',
     #'doc',
-    #'tests'
-    ]
+    #'tests',
+]
 
 
 foreach dir : project_dirs
diff --git a/meson_options.txt b/meson_options.txt
index 6c3a4455c07..5c36d889ada 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -33,7 +33,8 @@ option(
         '-Wno-unused-parameter',
         '-Wno-variadic-macros',
         '-Wdeprecated-declarations',
-        '-Wno-missing-field-initializers'],
+        '-Wno-missing-field-initializers',
+    ],
     description : 'C build flags')
 
 
@@ -42,20 +43,14 @@ option(
 
 option(
     'enable_gc',
-    type : 'boolean',
-    value : 'true',
-    description : 'Build nix with Boehm garbage collector')
-
-option(
-    'with_libsodium',
     type : 'feature',
     value : 'auto',
-    description : 'Build nix with libsodium')
+    description : 'Build nix with Boehm garbage collector')
 
 option(
     'with_s3',
-    type : 'boolean',
-    value : 'false',
+    type : 'feature',
+    value : 'auto',
     description : 'Build nix with s3')
 
 option(
diff --git a/scripts/meson.build b/scripts/meson.build
index 1820ae4b9ca..ac632074233 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -1,7 +1,6 @@
 # Nix corepkgs build file
 #============================================================================
 
-scripts_dir = meson.current_source_dir()
 scripts_inc = [include_directories('.')]
 
 
@@ -9,8 +8,10 @@ scripts_inc = [include_directories('.')]
 #============================================================================
 
 scripts_data = files(
-    join_paths(scripts_dir, 'install-darwin-multi-user.sh'),
-    join_paths(scripts_dir, 'install-multi-user.sh'))
+    'install-darwin-multi-user.sh',
+    'install-multi-user.sh',
+)
+
 
 
 # targets
diff --git a/src/build-remote/meson.build b/src/build-remote/meson.build
index 93ce1608bbf..d524dba2b68 100644
--- a/src/build-remote/meson.build
+++ b/src/build-remote/meson.build
@@ -1,7 +1,6 @@
 # build-remote build file
 #============================================================================
 
-build_remote_dir = meson.current_source_dir()
 build_remote_inc = [include_directories('.')]
 
 
@@ -9,7 +8,8 @@ build_remote_inc = [include_directories('.')]
 #============================================================================
 
 build_remote_src = files(
-    join_paths(build_remote_dir, 'build-remote.cc'))
+    'build-remote.cc',
+)
 
 
 build_remote_headers = files()
diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
index 9c688fc197a..a81724e4e28 100644
--- a/src/libcmd/meson.build
+++ b/src/libcmd/meson.build
@@ -1,7 +1,6 @@
 # libmain build file
 #============================================================================
 
-libcmd_dir = meson.current_source_dir()
 libcmd_inc = [include_directories('.')]
 
 
@@ -28,17 +27,19 @@ libcmd_dep_list = [
 #============================================================================
 
 libcmd_src = files(
-    join_paths(libcmd_dir, 'command.cc'),
-    join_paths(libcmd_dir, 'installables.cc'),
-    join_paths(libcmd_dir, 'legacy.cc'),
-    join_paths(libcmd_dir, 'markdown.cc'))
+    'command.cc',
+    'installables.cc',
+    'legacy.cc',
+    'markdown.cc',
+)
 
 
 libcmd_headers = files(
-    join_paths(libcmd_dir, 'command.hh'),
-    join_paths(libcmd_dir, 'installables.hh'),
-    join_paths(libcmd_dir, 'legacy.hh'),
-    join_paths(libcmd_dir, 'markdown.hh'))
+    'command.hh',
+    'installables.hh',
+    'legacy.hh',
+    'markdown.hh',
+)
 
 
 # build
diff --git a/src/libexpr/flake/meson.build b/src/libexpr/flake/meson.build
index 3d6e8daf90d..536e7b9576c 100644
--- a/src/libexpr/flake/meson.build
+++ b/src/libexpr/flake/meson.build
@@ -10,15 +10,17 @@ libexpr_priomops_dir = meson.current_source_dir()
 libexpr_inc += include_directories('.')
 
 libexpr_src += files(
-    join_paths(libexpr_priomops_dir, 'config.cc'),
-    join_paths(libexpr_priomops_dir, 'flake.cc'),
-    join_paths(libexpr_priomops_dir, 'flakeref.cc'),
-    join_paths(libexpr_priomops_dir, 'lockfile.cc'))
+    'config.cc',
+    'flake.cc',
+    'flakeref.cc',
+    'lockfile.cc',
+)
 
 libexpr_headers += files(
-    join_paths(libexpr_priomops_dir, 'flake.hh'),
-    join_paths(libexpr_priomops_dir, 'flakeref.hh'),
-    join_paths(libexpr_priomops_dir, 'lockfile.hh'))
+    'flake.hh',
+    'flakeref.hh',
+    'lockfile.hh',
+)
 
 
 # targets
diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build
index 73751c81462..85bf5d66f11 100644
--- a/src/libexpr/meson.build
+++ b/src/libexpr/meson.build
@@ -1,7 +1,6 @@
 # Nix lib expr build file
 #============================================================================
 
-libexpr_dir = meson.current_source_dir()
 libexpr_inc = proj_inc
 
 
@@ -24,36 +23,38 @@ libexpr_dep_list = [
 #============================================================================
 
 libexpr_src = files(
-    join_paths(libexpr_dir, 'attr-path.cc'),
-    join_paths(libexpr_dir, 'attr-set.cc'),
-    join_paths(libexpr_dir, 'common-eval-args.cc'),
-    join_paths(libexpr_dir, 'eval-cache.cc'),
-    join_paths(libexpr_dir, 'eval.cc'),
-    join_paths(libexpr_dir, 'function-trace.cc'),
-    join_paths(libexpr_dir, 'get-drvs.cc'),
-    join_paths(libexpr_dir, 'json-to-value.cc'),
-    join_paths(libexpr_dir, 'nixexpr.cc'),
-    join_paths(libexpr_dir, 'primops.cc'),
-    join_paths(libexpr_dir, 'value-to-json.cc'),
-    join_paths(libexpr_dir, 'value-to-xml.cc'))
+    'attr-path.cc',
+    'attr-set.cc',
+    'common-eval-args.cc',
+    'eval-cache.cc',
+    'eval.cc',
+    'function-trace.cc',
+    'get-drvs.cc',
+    'json-to-value.cc',
+    'nixexpr.cc',
+    'primops.cc',
+    'value-to-json.cc',
+    'value-to-xml.cc',
+)
 
 
 libexpr_headers = files(
-    join_paths(libexpr_dir, 'attr-path.hh'),
-    join_paths(libexpr_dir, 'attr-set.hh'),
-    join_paths(libexpr_dir, 'common-eval-args.hh'),
-    join_paths(libexpr_dir, 'eval-cache.hh'),
-    join_paths(libexpr_dir, 'eval.hh'),
-    join_paths(libexpr_dir, 'eval-inline.hh'),
-    join_paths(libexpr_dir, 'function-trace.hh'),
-    join_paths(libexpr_dir, 'get-drvs.hh'),
-    join_paths(libexpr_dir, 'json-to-value.hh'),
-    join_paths(libexpr_dir, 'nixexpr.hh'),
-    join_paths(libexpr_dir, 'primops.hh'),
-    join_paths(libexpr_dir, 'symbol-table.hh'),
-    join_paths(libexpr_dir, 'value.hh'),
-    join_paths(libexpr_dir, 'value-to-json.hh'),
-    join_paths(libexpr_dir, 'value-to-xml.hh'))
+    'attr-path.hh',
+    'attr-set.hh',
+    'common-eval-args.hh',
+    'eval-cache.hh',
+    'eval.hh',
+    'eval-inline.hh',
+    'function-trace.hh',
+    'get-drvs.hh',
+    'json-to-value.hh',
+    'nixexpr.hh',
+    'primops.hh',
+    'symbol-table.hh',
+    'value.hh',
+    'value-to-json.hh',
+    'value-to-xml.hh',
+)
 
 
 # include directories
@@ -68,7 +69,8 @@ libexpr_inc += include_directories('.')
 #---------------------------------------------------
 libexpr_dirs = [
   'flake',
-  'primops']
+  'primops',
+]
 
 foreach dir : libexpr_dirs
     subdir(dir)
@@ -135,7 +137,8 @@ libexpr_lib = library(
     install_dir : libdir,
     include_directories : [
         libexpr_inc,
-        proj_inc],
+        proj_inc,
+    ],
     cpp_args : libexpr_cxx_args,
     link_args : libexpr_link_args,
     dependencies : libexpr_dep_list)
diff --git a/src/libexpr/primops/meson.build b/src/libexpr/primops/meson.build
index 0423bc6093a..0fad35d9592 100644
--- a/src/libexpr/primops/meson.build
+++ b/src/libexpr/primops/meson.build
@@ -2,18 +2,17 @@
 #============================================================================
 
 
-libexpr_priomops_dir = meson.current_source_dir()
-
 # src files
 #============================================================================
 
 libexpr_inc += include_directories('.')
 
 libexpr_src += files(
-    join_paths(libexpr_priomops_dir, 'context.cc'),
-    join_paths(libexpr_priomops_dir, 'fetchMercurial.cc'),
-    join_paths(libexpr_priomops_dir, 'fetchTree.cc'),
-    join_paths(libexpr_priomops_dir, 'fromTOML.cc'))
+    'context.cc',
+    'fetchMercurial.cc',
+    'fetchTree.cc',
+    'fromTOML.cc',
+)
 
 
 # targets
diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build
index a259325457c..655d4250f8e 100644
--- a/src/libfetchers/meson.build
+++ b/src/libfetchers/meson.build
@@ -1,7 +1,6 @@
 # libfetchers build file
 #============================================================================
 
-libfetchers_dir =  meson.current_source_dir()
 libfetchers_inc = []
 
 # dependencies
@@ -18,29 +17,32 @@ libfetchers_dep_list = [
     sqlite3_dep,
 
     libutil_dep,
-    libstore_dep]
+    libstore_dep,
+]
 
 
 # src files
 #============================================================================
 
 libfetchers_src = files(
-    join_paths(libfetchers_dir, 'attrs.cc'),
-    join_paths(libfetchers_dir, 'cache.cc'),
-    join_paths(libfetchers_dir, 'fetchers.cc'),
-    join_paths(libfetchers_dir, 'git.cc'),
-    join_paths(libfetchers_dir, 'github.cc'),
-    join_paths(libfetchers_dir, 'indirect.cc'),
-    join_paths(libfetchers_dir, 'mercurial.cc'),
-    join_paths(libfetchers_dir, 'path.cc'),
-    join_paths(libfetchers_dir, 'registry.cc'),
-    join_paths(libfetchers_dir, 'tarball.cc'))
+    'attrs.cc',
+    'cache.cc',
+    'fetchers.cc',
+    'git.cc',
+    'github.cc',
+    'indirect.cc',
+    'mercurial.cc',
+    'path.cc',
+    'registry.cc',
+    'tarball.cc',
+)
 
 libfetchers_headers = files(
-    join_paths(libfetchers_dir, 'attrs.hh'),
-    join_paths(libfetchers_dir, 'cache.hh'),
-    join_paths(libfetchers_dir, 'fetchers.hh'),
-    join_paths(libfetchers_dir, 'registry.hh'))
+    'attrs.hh',
+    'cache.hh',
+    'fetchers.hh',
+    'registry.hh',
+)
 
 
 # include directories
@@ -75,17 +77,20 @@ libfetchers_lib = library(
     install_dir : libdir,
     include_directories : [
         libfetchers_inc,
-        proj_inc],
+        proj_inc,
+    ],
     cpp_args : libfetchers_cxx_args,
     link_args : libfetchers_link_args,
-    dependencies : libfetchers_dep_list)
+    dependencies : libfetchers_dep_list,
+)
 
 
 # install headers
 #---------------------------------------------------
 install_headers(
     libfetchers_headers,
-    install_dir : join_paths(includedir, 'nix'))
+    install_dir : join_paths(includedir, 'nix'),
+)
 
 
 # generate pkg-config
@@ -106,4 +111,5 @@ libfetchers_config = pkg.generate(
 #---------------------------------------------------
 libfetchers_dep = declare_dependency(
     link_with : libfetchers_lib,
-    include_directories : libfetchers_inc)
+    include_directories : libfetchers_inc,
+)
diff --git a/src/libmain/meson.build b/src/libmain/meson.build
index 9c8e03a3597..117063af76f 100644
--- a/src/libmain/meson.build
+++ b/src/libmain/meson.build
@@ -1,7 +1,6 @@
 # libmain build file
 #============================================================================
 
-libmain_dir = meson.current_source_dir()
 libmain_inc = []
 
 
@@ -14,25 +13,28 @@ libmain_dep_list = [
     libsodium_dep,
 
     libutil_dep,
-    libstore_dep]
+    libstore_dep,
+]
 
 
 # src files
 #============================================================================
 
 libmain_src = files(
-    join_paths(libmain_dir, 'common-args.cc'),
-    join_paths(libmain_dir, 'loggers.cc'),
-    join_paths(libmain_dir, 'progress-bar.cc'),
-    join_paths(libmain_dir, 'shared.cc'),
-    join_paths(libmain_dir, 'stack.cc'))
+    'common-args.cc',
+    'loggers.cc',
+    'progress-bar.cc',
+    'shared.cc',
+    'stack.cc',
+)
 
 
 libmain_headers = files(
-    join_paths(libmain_dir, 'common-args.hh'),
-    join_paths(libmain_dir, 'loggers.hh'),
-    join_paths(libmain_dir, 'progress-bar.hh'),
-    join_paths(libmain_dir, 'shared.hh'))
+    'common-args.hh',
+    'loggers.hh',
+    'progress-bar.hh',
+    'shared.hh',
+)
 
 
 # include directories
@@ -67,7 +69,8 @@ libmain_lib = library(
     install_dir : libdir,
     include_directories : [
         libmain_inc,
-        proj_inc],
+        proj_inc,
+    ],
     cpp_args : libmain_cxx_args,
     link_args : libmain_link_args,
     dependencies : libmain_dep_list)
diff --git a/src/libstore/build/meson.build b/src/libstore/build/meson.build
index d6c9e6bc838..5fbffeb58be 100644
--- a/src/libstore/build/meson.build
+++ b/src/libstore/build/meson.build
@@ -1,7 +1,6 @@
 # libstore.build build file
 #============================================================================
 
-libutil_build_dir = meson.current_source_dir()
 libstore_inc += include_directories('.')
 
 
@@ -9,22 +8,24 @@ libstore_inc += include_directories('.')
 #============================================================================
 
 libstore_src += files(
-    join_paths(libutil_build_dir, 'derivation-goal.cc'),
-    join_paths(libutil_build_dir, 'drv-output-substitution-goal.cc'),
-    join_paths(libutil_build_dir, 'entry-points.cc'),
-    join_paths(libutil_build_dir, 'goal.cc'),
-    join_paths(libutil_build_dir, 'hook-instance.cc'),
-    join_paths(libutil_build_dir, 'local-derivation-goal.cc'),
-    join_paths(libutil_build_dir, 'substitution-goal.cc'),
-    join_paths(libutil_build_dir, 'worker.cc'))
+    'derivation-goal.cc',
+    'drv-output-substitution-goal.cc',
+    'entry-points.cc',
+    'goal.cc',
+    'hook-instance.cc',
+    'local-derivation-goal.cc',
+    'substitution-goal.cc',
+    'worker.cc',
+)
 
 
 
 libstore_headers += files(
-    join_paths(libutil_build_dir, 'derivation-goal.hh'),
-    join_paths(libutil_build_dir, 'drv-output-substitution-goal.hh'),
-    join_paths(libutil_build_dir, 'goal.hh'),
-    join_paths(libutil_build_dir, 'hook-instance.hh'),
-    join_paths(libutil_build_dir, 'local-derivation-goal.hh'),
-    join_paths(libutil_build_dir, 'substitution-goal.hh'),
-    join_paths(libutil_build_dir, 'worker.hh'))
\ No newline at end of file
+    'derivation-goal.hh',
+    'drv-output-substitution-goal.hh',
+    'goal.hh',
+    'hook-instance.hh',
+    'local-derivation-goal.hh',
+    'substitution-goal.hh',
+    'worker.hh',
+)
diff --git a/src/libstore/builtins/meson.build b/src/libstore/builtins/meson.build
index b551e12d3dc..85770e98351 100644
--- a/src/libstore/builtins/meson.build
+++ b/src/libstore/builtins/meson.build
@@ -1,7 +1,6 @@
 # libstore.builtins build file
 #============================================================================
 
-libutil_builtins_dir = meson.current_source_dir()
 libstore_inc += include_directories('.')
 
 
@@ -9,10 +8,12 @@ libstore_inc += include_directories('.')
 #============================================================================
 
 libstore_src += files(
-    join_paths(libutil_builtins_dir, 'buildenv.cc'),
-    join_paths(libutil_builtins_dir, 'fetchurl.cc'),
-    join_paths(libutil_builtins_dir, 'unpack-channel.cc'))
+    'buildenv.cc',
+    'fetchurl.cc',
+    'unpack-channel.cc',
+)
 
 
 libstore_headers += files(
-    join_paths(libutil_builtins_dir, 'buildenv.hh'))
+    'buildenv.hh',
+)
diff --git a/src/libstore/meson.build b/src/libstore/meson.build
index bf8eb435470..5ee45a44158 100644
--- a/src/libstore/meson.build
+++ b/src/libstore/meson.build
@@ -1,7 +1,6 @@
 # libstore build file
 #============================================================================
 
-libstore_dir =  meson.current_source_dir()
 libstore_inc = [include_directories('.')]
 
 # dependencies
@@ -18,96 +17,100 @@ libstore_dep_list = [
     pthread_dep,
     sqlite3_dep,
 
-    libutil_dep]
+    libutil_dep,
+]
 
 
 # src files
 #============================================================================
 
 libstore_src = files(
-    join_paths(libstore_dir, 'binary-cache-store.cc'),
-    join_paths(libstore_dir, 'content-address.cc'),
-    join_paths(libstore_dir, 'crypto.cc'),
-    join_paths(libstore_dir, 'daemon.cc'),
-    join_paths(libstore_dir, 'derivations.cc'),
-    join_paths(libstore_dir, 'derived-path.cc'),
-    join_paths(libstore_dir, 'dummy-store.cc'),
-    join_paths(libstore_dir, 'export-import.cc'),
-    join_paths(libstore_dir, 'filetransfer.cc'),
-    join_paths(libstore_dir, 'gc.cc'),
-    join_paths(libstore_dir, 'globals.cc'),
-    join_paths(libstore_dir, 'http-binary-cache-store.cc'),
-    join_paths(libstore_dir, 'legacy-ssh-store.cc'),
-    join_paths(libstore_dir, 'local-binary-cache-store.cc'),
-    join_paths(libstore_dir, 'local-fs-store.cc'),
-    join_paths(libstore_dir, 'local-store.cc'),
-    join_paths(libstore_dir, 'lock.cc'),
-    join_paths(libstore_dir, 'machines.cc'),
-    join_paths(libstore_dir, 'misc.cc'),
-    join_paths(libstore_dir, 'names.cc'),
-    join_paths(libstore_dir, 'nar-accessor.cc'),
-    join_paths(libstore_dir, 'nar-info.cc'),
-    join_paths(libstore_dir, 'nar-info-disk-cache.cc'),
-    join_paths(libstore_dir, 'optimise-store.cc'),
-    join_paths(libstore_dir, 'parsed-derivations.cc'),
-    join_paths(libstore_dir, 'path.cc'),
-    join_paths(libstore_dir, 'pathlocks.cc'),
-    join_paths(libstore_dir, 'path-with-outputs.cc'),
-    join_paths(libstore_dir, 'profiles.cc'),
-    join_paths(libstore_dir, 'realisation.cc'),
-    join_paths(libstore_dir, 'references.cc'),
-    join_paths(libstore_dir, 'remote-fs-accessor.cc'),
-    join_paths(libstore_dir, 'remote-store.cc'),
-    join_paths(libstore_dir, 's3-binary-cache-store.cc'),
-    join_paths(libstore_dir, 'sqlite.cc'),
-    join_paths(libstore_dir, 'ssh.cc'),
-    join_paths(libstore_dir, 'ssh-store.cc'),
-    join_paths(libstore_dir, 'store-api.cc'),
-    join_paths(libstore_dir, 'uds-remote-store.cc'))
+    'binary-cache-store.cc',
+    'content-address.cc',
+    'crypto.cc',
+    'daemon.cc',
+    'derivations.cc',
+    'derived-path.cc',
+    'dummy-store.cc',
+    'export-import.cc',
+    'filetransfer.cc',
+    'gc.cc',
+    'globals.cc',
+    'http-binary-cache-store.cc',
+    'legacy-ssh-store.cc',
+    'local-binary-cache-store.cc',
+    'local-fs-store.cc',
+    'local-store.cc',
+    'lock.cc',
+    'machines.cc',
+    'misc.cc',
+    'names.cc',
+    'nar-accessor.cc',
+    'nar-info.cc',
+    'nar-info-disk-cache.cc',
+    'optimise-store.cc',
+    'parsed-derivations.cc',
+    'path.cc',
+    'pathlocks.cc',
+    'path-with-outputs.cc',
+    'profiles.cc',
+    'realisation.cc',
+    'references.cc',
+    'remote-fs-accessor.cc',
+    'remote-store.cc',
+    's3-binary-cache-store.cc',
+    'sqlite.cc',
+    'ssh.cc',
+    'ssh-store.cc',
+    'store-api.cc',
+    'uds-remote-store.cc',
+)
 
 libstore_headers = files(
-    join_paths(libstore_dir, 'binary-cache-store.hh'),
-    join_paths(libstore_dir, 'builtins.hh'),
-    join_paths(libstore_dir, 'content-address.hh'),
-    join_paths(libstore_dir, 'crypto.hh'),
-    join_paths(libstore_dir, 'daemon.hh'),
-    join_paths(libstore_dir, 'derivations.hh'),
-    join_paths(libstore_dir, 'derived-path.hh'),
-    join_paths(libstore_dir, 'filetransfer.hh'),
-    join_paths(libstore_dir, 'fs-accessor.hh'),
-    join_paths(libstore_dir, 'globals.hh'),
-    join_paths(libstore_dir, 'local-fs-store.hh'),
-    join_paths(libstore_dir, 'local-store.hh'),
-    join_paths(libstore_dir, 'lock.hh'),
-    join_paths(libstore_dir, 'machines.hh'),
-    join_paths(libstore_dir, 'names.hh'),
-    join_paths(libstore_dir, 'nar-accessor.hh'),
-    join_paths(libstore_dir, 'nar-info-disk-cache.hh'),
-    join_paths(libstore_dir, 'nar-info.hh'),
-    join_paths(libstore_dir, 'parsed-derivations.hh'),
-    join_paths(libstore_dir, 'path.hh'),
-    join_paths(libstore_dir, 'path-info.hh'),
-    join_paths(libstore_dir, 'pathlocks.hh'),
-    join_paths(libstore_dir, 'path-with-outputs.hh'),
-    join_paths(libstore_dir, 'profiles.hh'),
-    join_paths(libstore_dir, 'realisation.hh'),
-    join_paths(libstore_dir, 'references.hh'),
-    join_paths(libstore_dir, 'remote-fs-accessor.hh'),
-    join_paths(libstore_dir, 'remote-store.hh'),
-    join_paths(libstore_dir, 's3-binary-cache-store.hh'),
-    join_paths(libstore_dir, 's3.hh'),
-    join_paths(libstore_dir, 'serve-protocol.hh'),
-    join_paths(libstore_dir, 'sqlite.hh'),
-    join_paths(libstore_dir, 'ssh.hh'),
-    join_paths(libstore_dir, 'store-api.hh'),
-    join_paths(libstore_dir, 'uds-remote-store.hh'),
-    join_paths(libstore_dir, 'worker-protocol.hh'))
+    'binary-cache-store.hh',
+    'builtins.hh',
+    'content-address.hh',
+    'crypto.hh',
+    'daemon.hh',
+    'derivations.hh',
+    'derived-path.hh',
+    'filetransfer.hh',
+    'fs-accessor.hh',
+    'globals.hh',
+    'local-fs-store.hh',
+    'local-store.hh',
+    'lock.hh',
+    'machines.hh',
+    'names.hh',
+    'nar-accessor.hh',
+    'nar-info-disk-cache.hh',
+    'nar-info.hh',
+    'parsed-derivations.hh',
+    'path.hh',
+    'path-info.hh',
+    'pathlocks.hh',
+    'path-with-outputs.hh',
+    'profiles.hh',
+    'realisation.hh',
+    'references.hh',
+    'remote-fs-accessor.hh',
+    'remote-store.hh',
+    's3-binary-cache-store.hh',
+    's3.hh',
+    'serve-protocol.hh',
+    'sqlite.hh',
+    'ssh.hh',
+    'store-api.hh',
+    'uds-remote-store.hh',
+    'worker-protocol.hh',
+)
 
 
 libstore_data = files(
-    join_paths(libstore_dir, 'sandbox-defaults.sb'),
-    join_paths(libstore_dir, 'sandbox-minimal.sb'),
-    join_paths(libstore_dir, 'sandbox-network.sb'))
+    'sandbox-defaults.sb',
+    'sandbox-minimal.sb',
+    'sandbox-network.sb',
+)
 
 
 # include directories
@@ -115,7 +118,8 @@ libstore_data = files(
 
 libstore_dirs = [
     'build',
-    'builtins']
+    'builtins',
+]
 
 
 foreach dir : libstore_dirs
@@ -171,7 +175,8 @@ libstore_lib = library(
     install_dir : libdir,
     include_directories : [
         libstore_inc,
-        proj_inc],
+        proj_inc,
+    ],
     cpp_args : libstore_cxx_args,
     link_args : libstore_link_args,
     dependencies : libstore_dep_list)
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index 901d0510182..f4af35b605b 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -1,7 +1,6 @@
 # libutil build file
 #============================================================================
 
-libutil_dir = meson.current_source_dir()
 libutil_inc = [include_directories('.')]
 
 
@@ -20,66 +19,68 @@ libutil_dep_list = [
     nlohmann_dep,
     openssl_dep,
     pthread_dep,
-    zlib_dep
-    ]
+    zlib_dep,
+]
 
 
 # src files
 #============================================================================
 
 libutil_src = files(
-    join_paths(libutil_dir, 'affinity.cc'),
-    join_paths(libutil_dir, 'archive.cc'),
-    join_paths(libutil_dir, 'args.cc'),
-    join_paths(libutil_dir, 'compression.cc'),
-    join_paths(libutil_dir, 'compute-levels.cc'),
-    join_paths(libutil_dir, 'config.cc'),
-    join_paths(libutil_dir, 'error.cc'),
-    join_paths(libutil_dir, 'hash.cc'),
-    join_paths(libutil_dir, 'json.cc'),
-    join_paths(libutil_dir, 'logging.cc'),
-    join_paths(libutil_dir, 'rust-ffi.cc'),
-    join_paths(libutil_dir, 'serialise.cc'),
-    join_paths(libutil_dir, 'tarfile.cc'),
-    join_paths(libutil_dir, 'thread-pool.cc'),
-    join_paths(libutil_dir, 'url.cc'),
-    join_paths(libutil_dir, 'util.cc'),
-    join_paths(libutil_dir, 'xml-writer.cc'))
+    'affinity.cc',
+    'archive.cc',
+    'args.cc',
+    'compression.cc',
+    'compute-levels.cc',
+    'config.cc',
+    'error.cc',
+    'hash.cc',
+    'json.cc',
+    'logging.cc',
+    'rust-ffi.cc',
+    'serialise.cc',
+    'tarfile.cc',
+    'thread-pool.cc',
+    'url.cc',
+    'util.cc',
+    'xml-writer.cc',
+)
 
 libutil_headers = files(
-    join_paths(libutil_dir, 'abstract-setting-to-json.hh'),
-    join_paths(libutil_dir, 'affinity.hh'),
-    join_paths(libutil_dir, 'ansicolor.hh'),
-    join_paths(libutil_dir, 'archive.hh'),
-    join_paths(libutil_dir, 'args.hh'),
-    join_paths(libutil_dir, 'callback.hh'),
-    join_paths(libutil_dir, 'comparator.hh'),
-    join_paths(libutil_dir, 'compression.hh'),
-    join_paths(libutil_dir, 'compute-levels.hh'),
-    join_paths(libutil_dir, 'config.hh'),
-    join_paths(libutil_dir, 'error.hh'),
-    join_paths(libutil_dir, 'finally.hh'),
-    join_paths(libutil_dir, 'fmt.hh'),
-    join_paths(libutil_dir, 'hash.hh'),
-    join_paths(libutil_dir, 'json.hh'),
-    join_paths(libutil_dir, 'logging.hh'),
-    join_paths(libutil_dir, 'lru-cache.hh'),
-    join_paths(libutil_dir, 'monitor-fd.hh'),
-    join_paths(libutil_dir, 'pool.hh'),
-    join_paths(libutil_dir, 'ref.hh'),
-    join_paths(libutil_dir, 'rust-ffi.hh'),
-    join_paths(libutil_dir, 'serialise.hh'),
-    join_paths(libutil_dir, 'split.hh'),
-    join_paths(libutil_dir, 'sync.hh'),
-    join_paths(libutil_dir, 'tarfile.hh'),
-    join_paths(libutil_dir, 'thread-pool.hh'),
-    join_paths(libutil_dir, 'topo-sort.hh'),
-    join_paths(libutil_dir, 'types.hh'),
-    join_paths(libutil_dir, 'url.hh'),
-    join_paths(libutil_dir, 'url-parts.hh'),
-    join_paths(libutil_dir, 'util.hh'),
-    join_paths(libutil_dir, 'xml-writer.hh'))
-    
+    'abstract-setting-to-json.hh',
+    'affinity.hh',
+    'ansicolor.hh',
+    'archive.hh',
+    'args.hh',
+    'callback.hh',
+    'comparator.hh',
+    'compression.hh',
+    'compute-levels.hh',
+    'config.hh',
+    'error.hh',
+    'finally.hh',
+    'fmt.hh',
+    'hash.hh',
+    'json.hh',
+    'logging.hh',
+    'lru-cache.hh',
+    'monitor-fd.hh',
+    'pool.hh',
+    'ref.hh',
+    'rust-ffi.hh',
+    'serialise.hh',
+    'split.hh',
+    'sync.hh',
+    'tarfile.hh',
+    'thread-pool.hh',
+    'topo-sort.hh',
+    'types.hh',
+    'url.hh',
+    'url-parts.hh',
+    'util.hh',
+    'xml-writer.hh',
+)
+
 
 # build
 #============================================================================
@@ -101,7 +102,8 @@ libutil_lib = library(
     install_dir : libdir,
     include_directories : [
         libutil_inc,
-        proj_inc],
+        proj_inc
+    ],
     cpp_args : libutil_cxx_args,
     link_args : libutil_link_args,
     dependencies : libutil_dep_list)
diff --git a/src/libutil/tests/meson.build b/src/libutil/tests/meson.build
index 5f0607fd8ac..908f00b65b6 100644
--- a/src/libutil/tests/meson.build
+++ b/src/libutil/tests/meson.build
@@ -1,7 +1,6 @@
 # libutil.tests build file
 #============================================================================
 
-libutil_tests_dir = meson.current_source_dir()
 libutil_tests_inc = [include_directories('.')]
 
 # dependancies
@@ -17,17 +16,18 @@ libutil_tests_dep_list = [
 #============================================================================
 
 libutil_tests_src = files(
-    join_paths(libutil_tests_dir, 'compression.cc'),
-    join_paths(libutil_tests_dir, 'config.cc'),
-    join_paths(libutil_tests_dir, 'hash.cc'),
-    join_paths(libutil_tests_dir, 'json.cc'),
-    join_paths(libutil_tests_dir, 'logging.cc'),
-    join_paths(libutil_tests_dir, 'lru-cache.cc'),
-    join_paths(libutil_tests_dir, 'main.cc'),
-    join_paths(libutil_tests_dir, 'pool.cc'),
-    join_paths(libutil_tests_dir, 'tests.cc'),
-    join_paths(libutil_tests_dir, 'url.cc'),
-    join_paths(libutil_tests_dir, 'xml-writer.cc'))
+    'compression.cc',
+    'config.cc',
+    'hash.cc',
+    'json.cc',
+    'logging.cc',
+    'lru-cache.cc',
+    'main.cc',
+    'pool.cc',
+    'tests.cc',
+    'url.cc',
+    'xml-writer.cc',
+)
 
 
 # build
diff --git a/src/meson.build b/src/meson.build
index 7ceddfa08b7..cc0d8f105c9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -17,7 +17,8 @@ src_dirs = [
   'nix-env',
   'nix-instantiate',
   'nix-store',
-  'nix']
+  'nix',
+]
 
 if sys_name == 'Darwin'
   src_dirs += 'resolve-system-dependencies'
diff --git a/src/nix-build/meson.build b/src/nix-build/meson.build
index 303e45741b6..140ce62fab9 100644
--- a/src/nix-build/meson.build
+++ b/src/nix-build/meson.build
@@ -1,7 +1,6 @@
 # nix-build build file
 #============================================================================
 
-nix_build_dir = meson.current_source_dir()
 nix_build_inc = [include_directories('.')]
 
 
@@ -9,4 +8,5 @@ nix_build_inc = [include_directories('.')]
 #============================================================================
 
 nix_build_src = files(
-    join_paths(nix_build_dir, 'nix-build.cc'))
+    'nix-build.cc',
+)
diff --git a/src/nix-channel/meson.build b/src/nix-channel/meson.build
index 0e072c585d4..49def4f6b96 100644
--- a/src/nix-channel/meson.build
+++ b/src/nix-channel/meson.build
@@ -1,7 +1,6 @@
 # nix-channel channel file
 #============================================================================
 
-nix_channel_dir = meson.current_source_dir()
 nix_channel_inc = [include_directories('.')]
 
 
@@ -9,7 +8,8 @@ nix_channel_inc = [include_directories('.')]
 #============================================================================
 
 nix_channel_src = files(
-    join_paths(nix_channel_dir, 'nix-channel.cc'))
+    'nix-channel.cc',
+)
 
 
 # targets
diff --git a/src/nix-collect-garbage/meson.build b/src/nix-collect-garbage/meson.build
index 9aa31dda8dd..667ea5d1f1c 100644
--- a/src/nix-collect-garbage/meson.build
+++ b/src/nix-collect-garbage/meson.build
@@ -1,7 +1,6 @@
 # build-remote build file
 #============================================================================
 
-nix_collect_garbage_dir = meson.current_source_dir()
 nix_collect_garbage_inc = [include_directories('.')]
 
 
@@ -9,4 +8,5 @@ nix_collect_garbage_inc = [include_directories('.')]
 #============================================================================
 
 nix_collect_garbage_src = files(
-    join_paths(nix_collect_garbage_dir, 'nix-collect-garbage.cc'))
+    'nix-collect-garbage.cc',
+)
diff --git a/src/nix-copy-closure/meson.build b/src/nix-copy-closure/meson.build
index 0df4a6faba4..a4149db2d6c 100644
--- a/src/nix-copy-closure/meson.build
+++ b/src/nix-copy-closure/meson.build
@@ -1,7 +1,6 @@
 # nix-copy-closure build file
 #============================================================================
 
-nix_copy_closure_dir = meson.current_source_dir()
 nix_copy_closure_inc = [include_directories('.')]
 
 
@@ -9,4 +8,5 @@ nix_copy_closure_inc = [include_directories('.')]
 #============================================================================
 
 nix_copy_closure_src = files(
-    join_paths(nix_copy_closure_dir, 'nix-copy-closure.cc'))
+    'nix-copy-closure.cc',
+)
diff --git a/src/nix-env/meson.build b/src/nix-env/meson.build
index 502b5872474..3eacfc41108 100644
--- a/src/nix-env/meson.build
+++ b/src/nix-env/meson.build
@@ -1,7 +1,6 @@
 # nix-env build file
 #============================================================================
 
-nix_env_dir = meson.current_source_dir()
 nix_env_inc = [include_directories('.')]
 
 
@@ -9,8 +8,9 @@ nix_env_inc = [include_directories('.')]
 #============================================================================
 
 nix_env_src = files(
-    join_paths(nix_env_dir, 'nix-env.cc'),
-    join_paths(nix_env_dir, 'user-env.cc'))
+    'nix-env.cc',
+    'user-env.cc',
+)
 
 # targets
 #============================================================================
diff --git a/src/nix-instantiate/meson.build b/src/nix-instantiate/meson.build
index a394a82835a..33215233494 100644
--- a/src/nix-instantiate/meson.build
+++ b/src/nix-instantiate/meson.build
@@ -1,7 +1,6 @@
 # nix-instantiate build file
 #============================================================================
 
-nix_instantiate_dir = meson.current_source_dir()
 nix_instantiate_inc = [include_directories('.')]
 
 
@@ -9,4 +8,5 @@ nix_instantiate_inc = [include_directories('.')]
 #============================================================================
 
 nix_instantiate_src = files(
-    join_paths(nix_instantiate_dir, 'nix-instantiate.cc'))
+    'nix-instantiate.cc',
+)
diff --git a/src/nix-store/meson.build b/src/nix-store/meson.build
index 0b0797dc87b..0ec37a752e0 100644
--- a/src/nix-store/meson.build
+++ b/src/nix-store/meson.build
@@ -1,7 +1,6 @@
 # nix-store build file
 #============================================================================
 
-nix_store_dir = meson.current_source_dir()
 nix_store_inc = [include_directories('.')]
 
 
@@ -9,6 +8,7 @@ nix_store_inc = [include_directories('.')]
 #============================================================================
 
 nix_store_src = files(
-    join_paths(nix_store_dir, 'dotgraph.cc'),
-    join_paths(nix_store_dir, 'graphml.cc'),
-    join_paths(nix_store_dir, 'nix-store.cc'))
+    'dotgraph.cc',
+    'graphml.cc',
+    'nix-store.cc',
+)
diff --git a/src/nix/meson.build b/src/nix/meson.build
index c9ed807138d..98fbb25152b 100644
--- a/src/nix/meson.build
+++ b/src/nix/meson.build
@@ -2,7 +2,6 @@
 #============================================================================
 
 
-nix_dir = meson.current_source_dir()
 nix_inc = [include_directories('.')]
 
 # dependancies
@@ -18,56 +17,58 @@ nix_dep_list = [
 
     libutil_dep,
     libstore_dep,
+    libfetchers_dep,
     libmain_dep,
     libexpr_dep,
-    libfetchers_dep,
-    libcmd_dep]
+    libcmd_dep,
+]
 
 
 # src files
 #============================================================================
 
 nix_src = files(
-    join_paths(nix_dir, 'add-to-store.cc'),
-    join_paths(nix_dir, 'app.cc'),
-    join_paths(nix_dir, 'build.cc'),
-    join_paths(nix_dir, 'bundle.cc'),
-    join_paths(nix_dir, 'cat.cc'),
-    join_paths(nix_dir, 'copy.cc'),
-    join_paths(nix_dir, 'daemon.cc'),
-    join_paths(nix_dir, 'describe-stores.cc'),
-    join_paths(nix_dir, 'develop.cc'),
-    join_paths(nix_dir, 'diff-closures.cc'),
-    join_paths(nix_dir, 'doctor.cc'),
-    join_paths(nix_dir, 'dump-path.cc'),
-    join_paths(nix_dir, 'edit.cc'),
-    join_paths(nix_dir, 'eval.cc'),
-    join_paths(nix_dir, 'flake.cc'),
-    join_paths(nix_dir, 'hash.cc'),
-    join_paths(nix_dir, 'log.cc'),
-    join_paths(nix_dir, 'ls.cc'),
-    join_paths(nix_dir, 'main.cc'),
-    join_paths(nix_dir, 'make-content-addressable.cc'),
-    join_paths(nix_dir, 'nar.cc'),
-    join_paths(nix_dir, 'optimise-store.cc'),
-    join_paths(nix_dir, 'path-info.cc'),
-    join_paths(nix_dir, 'ping-store.cc'),
-    join_paths(nix_dir, 'prefetch.cc'),
-    join_paths(nix_dir, 'profile.cc'),
-    join_paths(nix_dir, 'registry.cc'),
-    join_paths(nix_dir, 'repl.cc'),
-    join_paths(nix_dir, 'run.cc'),
-    join_paths(nix_dir, 'search.cc'),
-    join_paths(nix_dir, 'show-config.cc'),
-    join_paths(nix_dir, 'show-derivation.cc'),
-    join_paths(nix_dir, 'sigs.cc'),
-    join_paths(nix_dir, 'store.cc'),
-    join_paths(nix_dir, 'store-delete.cc'),
-    join_paths(nix_dir, 'store-gc.cc'),
-    join_paths(nix_dir, 'store-repair.cc'),
-    join_paths(nix_dir, 'upgrade-nix.cc'),
-    join_paths(nix_dir, 'verify.cc'),
-    join_paths(nix_dir, 'why-depends.cc'))
+    'add-to-store.cc',
+    'app.cc',
+    'build.cc',
+    'bundle.cc',
+    'cat.cc',
+    'copy.cc',
+    'daemon.cc',
+    'describe-stores.cc',
+    'develop.cc',
+    'diff-closures.cc',
+    'doctor.cc',
+    'dump-path.cc',
+    'edit.cc',
+    'eval.cc',
+    'flake.cc',
+    'hash.cc',
+    'log.cc',
+    'ls.cc',
+    'main.cc',
+    'make-content-addressable.cc',
+    'nar.cc',
+    'optimise-store.cc',
+    'path-info.cc',
+    'ping-store.cc',
+    'prefetch.cc',
+    'profile.cc',
+    'registry.cc',
+    'repl.cc',
+    'run.cc',
+    'search.cc',
+    'show-config.cc',
+    'show-derivation.cc',
+    'sigs.cc',
+    'store.cc',
+    'store-delete.cc',
+    'store-gc.cc',
+    'store-repair.cc',
+    'upgrade-nix.cc',
+    'verify.cc',
+    'why-depends.cc',
+)
 
 # nix_ln_src = [
 #     [ bindir, 'nix-build' ],
@@ -81,7 +82,8 @@ nix_src = files(
 #     [ bindir, 'nix-prefetch-url' ],
 #     [ bindir, 'nix-shell' ],
 #     [ bindir, 'nix-store' ],
-#     [ join_paths(libexecdir, 'nix'), 'build-remote' ]]
+#     [ join_paths(libexecdir, 'nix'), 'build-remote' ],
+#]
 
 
 # targets
@@ -116,7 +118,8 @@ nix_bin = executable(
         # nix_daemon_src,
         nix_env_src,
         nix_instantiate_src,
-        nix_store_src],
+        nix_store_src,
+    ],
     install : true,
     install_mode : 'rwxr-xr-x',
     install_dir : bindir,
diff --git a/src/resolve-system-dependencies/meson.build b/src/resolve-system-dependencies/meson.build
index 6fe9d647771..d06de6b6d7e 100644
--- a/src/resolve-system-dependencies/meson.build
+++ b/src/resolve-system-dependencies/meson.build
@@ -1,7 +1,6 @@
 # resolve-system-dependencies build file
 #============================================================================
 
-resolvesysdeps_dir = meson.current_source_dir()
 resolvesysdeps_inc = [include_directories('.')]
 
 # dependancies
@@ -14,7 +13,8 @@ resolvesysdeps_dep_list = []
 #============================================================================
 
 resolvesysdeps_src = files(
-    join_paths(resolvesysdeps_dir, 'resolve-system-dependencies.cc'))
+    'resolve-system-dependencies.cc',
+)
 
 
 # build
@@ -37,4 +37,5 @@ resolvesysdeps_bin = executable(
     include_directories : proj_inc,
     cpp_args : resolvesysdeps_cxx_args,
     link_args : resolvesysdeps_link_args,
-    dependencies : resolvesysdeps_dep_list)
+    dependencies : resolvesysdeps_dep_list,
+)