From d250434e6c8eb4f8c8cb47ef3cc6e6de8fa8f828 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Fri, 15 Jan 2021 17:07:17 +0100 Subject: [PATCH] Use environment variable for a default module location diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c index 382fa0546..481ea0f14 100644 *** a/libobs/obs-nix.c --- b/libobs/obs-nix.c @@ -66,8 +66,19 @@ void add_default_module_paths(void) { - for (int i = 0; i < module_patterns_size; i++) - obs_add_module_path(module_bin[i], module_data[i]); + char *bin_directory = getenv("OBS_PLUGINS_DIRECTORY"); + char *data_directory = getenv("OBS_PLUGINS_DATA_DIRECTORY"); + if (bin_directory && data_directory) { + struct dstr dstr_data_directory; + dstr_init_copy(&dstr_data_directory, data_directory); + dstr_cat(&dstr_data_directory, "/%module%"); + obs_add_module_path(bin_directory, dstr_data_directory.array); + dstr_free(&dstr_data_directory); + + } else { + for (int i = 0; i < module_patterns_size; i++) + obs_add_module_path(module_bin[i], module_data[i]); + } } /* -- 2.29.2maryrefslogtreecommitdiff
path: root/gnu/image.scm
AgeCommit message (Expand)Author
2024-01-08scripts: system: Build layered images....* guix/scripts/system.scm (show-help, %docker-format-options, %options, %default-options, show-docker-format-options, show-docker-format-options/detailed, process-action): Handle '--max-layers' option. * gnu/system/image.scm (system-docker-image): Same. * gnu/image.scm (<image>)[max-layers]: New record field. Change-Id: I2726655aefd6688b976057fd5a38e9972ebfc292 Oleg Pykhalov
2022-09-24system: image: Add wsl2 support....* gnu/image.scm (<image>)[format]: Add wsl2 support. * gnu/system/image.scm (wsl2-image, wsl2-image-type): New variables. (image->root-file-system): Add wsl2 image support. (system-image): Ditto. Alex Griffin
2022-09-24system: image: Add tarball support....* gnu/image.scm (<image>)[fields]: Add tarball to the supported formats. * gnu/system/image.scm (tarball-image, tarball-image-type): New variables. (system-tarball-image): New procedure. (image->root-file-system): Add tarball image support. (system-image): Ditto. * doc/guix.texi ("System Images"): Document it. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Alex Griffin
2022-09-24image: Make the operating-system field mandatory....Make the operating-system field mandatory as creating an image without it makes no sense. Introduce a new macro, image-without-os for the specific cases where the image is only created to be inherited from afterwards. * gnu/image.scm (<image>)[operating-system]: Make it mandatory. * gnu/system/image.scm (image-without-os): New macro. (efi-disk-image, efi32-disk-image, iso9660-image, docker-image, raw-with-offset-disk-image): Use it. * gnu/system/images/hurd.scm (hurd-disk-image): Ditto. Mathieu Othacehe
2022-09-07image: Use #true and #false....* gnu/image.scm: Use #true and #false instead of #t and #f respectively. No functional change. Mathieu Othacehe
2022-09-07image: Use a default size partition value....* gnu/image.scm (<partition>)[size]: Default to 'guess like the image record. Mathieu Othacehe
2022-08-31image: Add comments....* gnu/image.scm: Add some comments across the whole module. Mathieu Othacehe
2022-08-30image: Remove an unused field....* gnu/image.scm (<partition>)[device]: Remove it. Mathieu Othacehe
2022-08-30image: Perform more sanitizing....* gnu/image.scm (validate-size, validate-partition-offset, validate-partition-flags): New macros. (<partition>)[size, offset, flags]: Sanitize those fields using the above procedures respectively. Mathieu Othacehe