commit 29cff6757e81eb50cda1d3f92384a4b162b9294f parent 5480cd3402074dde62ce6a70f08765d5a3ccce5a Author: Jan Pobříslo <ccx@te2000.cz> Date: Sun, 11 Dec 2022 01:58:34 +0100 nonfree subrepo Diffstat:
| M | zsh-functions/confz_site_containers_init | | | 18 | ++++++++++++++++-- |
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init @@ -178,6 +178,20 @@ confz_site_container_void_glibc_check() { :containers_dir :svscan_dir :image_name :packages } +confz_site_container_void_glibc_nonfree_check() { + checkvars containers_dir svscan_dir image_name packages + defvar arch x86_64 + defvar repository current + + require container_void_image \ + xbps_install_executable=xbps-install.static \ + :containers_dir :arch :repository :image_name + require container_void_packages_installed \ + :containers_dir :svscan_dir :image_name packages=void-repo-nonfree + require container_void_packages_installed \ + :containers_dir :svscan_dir :image_name :packages +} + confz_site_container_nix_check() { checkvars containers_dir svscan_dir image_name packages defvar system x86_64-linux @@ -426,9 +440,9 @@ confz_site_container_images_check() { # image_name=void-signal \ # packages="$void_x11 htop xdg-utils mesa-demos Signal-Desktop" - require site_container_void_glibc :containers_dir :svscan_dir \ + require site_container_void_glibc_nonfree :containers_dir :svscan_dir \ image_name=void-games \ - packages="$void_core void-repo-nonfree dwarffortress adom" + packages="$void_core dwarffortress adom" local -a nix_core=( s6