diff options
| author | Maxim Cournoyer <[email protected]> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch')
| -rw-r--r-- | gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch b/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch deleted file mode 100644 index ffa75918b8..0000000000 --- a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4c02c080475c9d08dbed98dd64ecca337aa359ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <[email protected]> -Date: Sat, 20 Feb 2021 20:37:39 +0800 -Subject: [PATCH] Allow set libretro_directory via environment variable - ---- - retroarch.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/retroarch.c b/retroarch.c -index 8a0461c816..cbf11d8b6a 100644 ---- a/retroarch.c -+++ b/retroarch.c -@@ -17603,7 +17603,18 @@ static bool retroarch_parse_input_and_config( - p_rarch->configuration_settings->bools.log_to_file, - p_rarch->configuration_settings->bools.log_to_file_timestamp, - p_rarch->configuration_settings->paths.log_dir); -- -+ -+ /* Override settings via environment variables */ -+ { -+ settings_t *settings = p_rarch->configuration_settings; -+ char *value = getenv("LIBRETRO_DIRECTORY"); -+ if (value != NULL) -+ { -+ retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL); -+ configuration_set_string(settings, settings->paths.directory_libretro, value); -+ } -+ } -+ - /* Second pass: All other arguments override the config file */ - optind = 1; - --- -2.33.0 - |