diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index c8d8394661dc..601ff014b026 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -35,11 +35,11 @@ }: let - version = "1.10.0"; + version = "1.10.1"; libretroCoreInfo = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - sha256 = "sha256-3j7fvcfbgyk71MmbUUKYi+/0cpQFNbYXO+DMDUjDqkQ="; + sha256 = "sha256-9HpfzVv1XG5fE15yM+XiVWjr+fE3xj7oRYp0LHZ/3Xg="; rev = "v${version}"; }; runtimeLibs = lib.optional withVulkan vulkan-loader @@ -52,13 +52,13 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "sha256-bpTSzODVRKRs1OW6JafjbU3e/AqdQeGzWcg1lb9SIyo="; + sha256 = "sha256-E0tY5YRBcew6NIVDgTNGBuxSRR0qM9bCBE+gYn61eQQ"; rev = "v${version}"; }; patches = [ - ./0001-Disable-menu_show_core_updater.patch - ./0002-Use-fixed-paths-on-libretro_info_path.patch + ./disable-menu_show_core_updater.patch + ./use-fixed-paths-on-libretro_info_path.patch ]; postPatch = '' diff --git a/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch deleted file mode 100644 index 34fea554ef71..000000000000 --- a/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/retroarch.cfg b/retroarch.cfg -index cdcb199c9f..ab72f3920f 100644 ---- a/retroarch.cfg -+++ b/retroarch.cfg -@@ -681,7 +681,7 @@ - # menu_show_online_updater = true - - # If disabled, will hide the ability to update cores (and core info files) inside the menu. --# menu_show_core_updater = true -+menu_show_core_updater = false - - # If disabled, the libretro core will keep running in the background when we - # are in the menu. diff --git a/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch b/pkgs/applications/emulators/retroarch/disable-menu_show_core_updater.patch similarity index 92% rename from pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch rename to pkgs/applications/emulators/retroarch/disable-menu_show_core_updater.patch index 75018dc8c4d1..427cb4871dc9 100644 --- a/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch +++ b/pkgs/applications/emulators/retroarch/disable-menu_show_core_updater.patch @@ -1,7 +1,7 @@ From 546b343294209abbb193883ab76b679b7f99c6d3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 20 Nov 2021 16:03:50 -0300 -Subject: [PATCH 1/2] Disable "menu_show_core_updater" +Subject: [PATCH] Disable "menu_show_core_updater" --- retroarch.cfg | 2 +- diff --git a/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch b/pkgs/applications/emulators/retroarch/use-fixed-paths-on-libretro_info_path.patch similarity index 75% rename from pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch rename to pkgs/applications/emulators/retroarch/use-fixed-paths-on-libretro_info_path.patch index 9aa8db6ab048..fd3913ea157e 100644 --- a/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch +++ b/pkgs/applications/emulators/retroarch/use-fixed-paths-on-libretro_info_path.patch @@ -1,7 +1,7 @@ -From 6788718299e1aba3ff8b31cd6ef012e8d3643bd3 Mon Sep 17 00:00:00 2001 +From 7bf021529ff15ca2580b15b3c0bfdc137d5beffe Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada -Date: Sat, 20 Nov 2021 15:59:23 -0300 -Subject: [PATCH 2/2] Use fixed paths on "libretro_info_path" +Date: Wed, 9 Mar 2022 18:24:15 +0000 +Subject: [PATCH] Use fixed paths on "libretro_info_path" This patch sets "libretro_info_path" to `handle = false`, so instead of using the values from `retroarch.cfg`, it will always use the default. @@ -10,16 +10,16 @@ Also, it patches the default "libretro_info_path" to the `@libretro_info_path` string, so we can substitute it with the full path to it during build. --- - configuration.c | 2 +- - frontend/drivers/platform_darwin.m | 9 ++------- - frontend/drivers/platform_unix.c | 8 ++++---- - 3 files changed, 7 insertions(+), 12 deletions(-) + configuration.c | 2 +- + frontend/drivers/platform_darwin.m | 9 ++------- + frontend/drivers/platform_unix.c | 12 ++++-------- + 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/configuration.c b/configuration.c -index e6a3841324..afb1d6e2ce 100644 +index 7e346ff6e9..c4b2100203 100644 --- a/configuration.c +++ b/configuration.c -@@ -1456,7 +1456,7 @@ static struct config_path_setting *populate_settings_path( +@@ -1466,7 +1466,7 @@ static struct config_path_setting *populate_settings_path( SETTING_PATH("core_options_path", settings->paths.path_core_options, false, NULL, true); SETTING_PATH("libretro_info_path", @@ -29,10 +29,10 @@ index e6a3841324..afb1d6e2ce 100644 settings->paths.path_content_database, false, NULL, true); SETTING_PATH("cheat_database_path", diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m -index f922e50c55..52732f65ae 100644 +index 6c5fdca400..552dcb7e2b 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m -@@ -383,14 +383,9 @@ static void frontend_darwin_get_env(int *argc, char *argv[], +@@ -388,14 +388,9 @@ static void frontend_darwin_get_env(int *argc, char *argv[], home_dir_buf, "shaders_glsl", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER])); #endif @@ -50,21 +50,25 @@ index f922e50c55..52732f65ae 100644 #ifdef HAVE_VIDEO_LAYOUT fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_LAYOUT], home_dir_buf, "layouts", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_LAYOUT])); diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c -index 722e1c595c..d87e01cf12 100644 +index b3b5dad173..7f1561e523 100644 --- a/frontend/drivers/platform_unix.c +++ b/frontend/drivers/platform_unix.c -@@ -1815,8 +1815,8 @@ static void frontend_unix_get_env(int *argc, +@@ -1820,12 +1820,8 @@ static void frontend_unix_get_env(int *argc, strcpy_literal(base_path, "retroarch"); #endif -- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], base_path, -- "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); +- if (!string_is_empty(libretro_directory)) +- strlcpy(g_defaults.dirs[DEFAULT_DIR_CORE], libretro_directory, +- sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); +- else +- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], base_path, +- "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], "@libretro_directory@", + "", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); #if defined(DINGUX) /* On platforms that require manual core installation/ * removal, placing core info files in the same directory -@@ -1825,8 +1825,8 @@ static void frontend_unix_get_env(int *argc, +@@ -1834,8 +1830,8 @@ static void frontend_unix_get_env(int *argc, fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path, "core_info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); #else @@ -76,5 +80,5 @@ index 722e1c595c..d87e01cf12 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path, "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG])); -- -2.31.1 +2.32.0