From 2279419ede9f5a6039da79e8a44f09bc23c541c4 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 29 Aug 2020 14:11:17 -0400 Subject: refactor(tvix): Drop meson.build files These are unused, and I'm not sure they ever actually worked. Change-Id: I6bb6b4257b7815932581ded7929437dba80961c9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1885 Tested-by: BuildkiteCI Reviewed-by: kanepyork Reviewed-by: tazjin --- third_party/nix/corepkgs/meson.build | 32 -------------- third_party/nix/doc/manual/meson.build | 5 --- third_party/nix/doc/meson.build | 13 ------ third_party/nix/misc/meson.build | 7 --- third_party/nix/misc/systemd/meson.build | 26 ----------- third_party/nix/scripts/meson.build | 74 -------------------------------- 6 files changed, 157 deletions(-) delete mode 100644 third_party/nix/corepkgs/meson.build delete mode 100644 third_party/nix/doc/manual/meson.build delete mode 100644 third_party/nix/doc/meson.build delete mode 100644 third_party/nix/misc/meson.build delete mode 100644 third_party/nix/misc/systemd/meson.build delete mode 100644 third_party/nix/scripts/meson.build (limited to 'third_party/nix') diff --git a/third_party/nix/corepkgs/meson.build b/third_party/nix/corepkgs/meson.build deleted file mode 100644 index 383909b0f7fe..000000000000 --- a/third_party/nix/corepkgs/meson.build +++ /dev/null @@ -1,32 +0,0 @@ -corepkgs_data = files( - join_paths(meson.source_root(), 'corepkgs/buildenv.nix'), - join_paths(meson.source_root(), 'corepkgs/derivation.nix'), - join_paths(meson.source_root(), 'corepkgs/fetchurl.nix'), - join_paths(meson.source_root(), 'corepkgs/imported-drv-to-derivation.nix'), - join_paths(meson.source_root(), 'corepkgs/unpack-channel.nix')) - -config_nix = configuration_data() -config_nix.set('bash', bash.path()) -config_nix.set('coreutils', coreutils) -config_nix.set('bzip2', bzip2.path()) -config_nix.set('gzip', gzip.path()) -config_nix.set('xz', xz.path()) -config_nix.set('tar', tar.path()) -config_nix.set('tarFlags', '') -config_nix.set('tr', tr.path()) -config_nix.set('bindir', bindir) -config_nix.set('prefix', prefix) -config_nix.set('libexecdir', libexecdir) -config_nix.set('localstatedir', localstatedir) -config_nix.set('sysconfdir', sysconfdir) -config_nix.set('storedir', nixstoredir) - -corepkgs_data += configure_file( - input : 'config.nix.in', - output : 'config.nix', - configuration : config_nix) - -install_data( - corepkgs_data, - install_mode : 'rwxr-xr-x', - install_dir : join_paths(datadir, 'nix/corepkgs')) diff --git a/third_party/nix/doc/manual/meson.build b/third_party/nix/doc/manual/meson.build deleted file mode 100644 index 42e0695a9a16..000000000000 --- a/third_party/nix/doc/manual/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -# nix manual build file -#============================================================================ - - -# TODO: generate the manual diff --git a/third_party/nix/doc/meson.build b/third_party/nix/doc/meson.build deleted file mode 100644 index 6d90b784a58f..000000000000 --- a/third_party/nix/doc/meson.build +++ /dev/null @@ -1,13 +0,0 @@ -# nix doc build file -#============================================================================ - -doc_dirs = [ - 'manual' -] - -if (not get_option('disable_doc_gen')) - xsltproc = find_program('xsltproc', required : true) - foreach dir : doc_dirs - subdir(dir) - endforeach -endif \ No newline at end of file diff --git a/third_party/nix/misc/meson.build b/third_party/nix/misc/meson.build deleted file mode 100644 index 1b381de5a16e..000000000000 --- a/third_party/nix/misc/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -misc_dirs = [ - 'systemd', -] - -foreach dir : misc_dirs - subdir(dir) -endforeach diff --git a/third_party/nix/misc/systemd/meson.build b/third_party/nix/misc/systemd/meson.build deleted file mode 100644 index 588f0b3d9d6b..000000000000 --- a/third_party/nix/misc/systemd/meson.build +++ /dev/null @@ -1,26 +0,0 @@ -# nix systemd build file -#============================================================================ - -if (sys_name.contains('linux')) - - systemd_data = [] - - systemd_nix_daemon = configuration_data() - systemd_nix_daemon.set('bindir', bindir) - systemd_nix_daemon.set('storedir', nixstoredir) - systemd_nix_daemon.set('localstatedir', localstatedir) - - systemd_data += configure_file( - input : 'nix-daemon.socket.in', - output : 'nix-daemon.socket', - configuration : systemd_nix_daemon) - - systemd_data += configure_file( - input : 'nix-daemon.service.in', - output : 'nix-daemon.service', - configuration : systemd_nix_daemon) - - install_data( - systemd_data, - install_dir : join_paths(prefix, 'lib/systemd/system')) -endif diff --git a/third_party/nix/scripts/meson.build b/third_party/nix/scripts/meson.build deleted file mode 100644 index 8787a185d03e..000000000000 --- a/third_party/nix/scripts/meson.build +++ /dev/null @@ -1,74 +0,0 @@ -# Nix corepkgs build file -#============================================================================ - - - - -# src files -#============================================================================ - -scripts_data = files( - join_paths(meson.source_root(), 'scripts/install-darwin-multi-user.sh'), - join_paths(meson.source_root(), 'scripts/install-multi-user.sh')) - - - - - -# targets -#============================================================================ - -nix_profile_sh = configuration_data() -nix_profile_sh.set('localstatedir', localstatedir) -nix_profile_sh.set('coreutils', coreutils) - -nix_http_export_cgi = configuration_data() -nix_http_export_cgi.set('bindir', bindir) -nix_http_export_cgi.set('localstatedir', localstatedir) -nix_http_export_cgi.set('coreutils', coreutils) -nix_http_export_cgi.set('gzip', gzip.path()) - -nix_reduce_build = configuration_data() -nix_reduce_build.set('bash', bash.path()) -nix_reduce_build.set('bindir', bindir) -nix_reduce_build.set('localstatedir', localstatedir) - - -# TODO: make these work -nix_install = configuration_data() -nix_install.set('nixVersion', package_version) -nix_install.set('binaryTarball_x86_64-linux', '') -nix_install.set('binaryTarball_i686-linux', '') -nix_install.set('binaryTarball_aarch64-linux', '') -nix_install.set('binaryTarball_x86_64-darwin', '') - - - - -# build -#============================================================================ - -scripts_data += configure_file( - input : 'nix-profile.sh.in', - output : 'nix.sh', - configuration : nix_profile_sh) - -scripts_data += configure_file( - input : 'nix-profile-daemon.sh.in', - output : 'nix-daemon.sh', - configuration : nix_profile_sh) - -scripts_data += configure_file( - input : 'nix-http-export.cgi.in', - output : 'nix-http-export.cgi', - configuration : nix_http_export_cgi) - -scripts_data += configure_file( - input : 'nix-reduce-build.in', - output : 'nix-reduce-build', - configuration : nix_reduce_build) - -install_data( - scripts_data, - install_mode : 'rwxr-xr-x', - install_dir : profiledir) -- cgit 1.4.1