From 6b4c7368fa83180853063373a5b7e332fe44363c Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 5 Mar 2022 01:00:30 +0000
Subject: [PATCH 01/10] retroarchBare: re-add support to Darwin

This still doesn't fix our wrapped retroarch binary, but should be
sufficient to build retroarch+cores in Darwin.
---
 .../emulators/retroarch/default.nix           | 23 ++++++++++++++++---
 .../emulators/retroarch/wrapper.nix           | 16 ++++++++-----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix
index 2c49874e5446..c8d8394661dc 100644
--- a/pkgs/applications/emulators/retroarch/default.nix
+++ b/pkgs/applications/emulators/retroarch/default.nix
@@ -104,10 +104,30 @@ stdenv.mkDerivation rec {
   '' + lib.optionalString (runtimeLibs != [ ]) ''
     wrapProgram $out/bin/retroarch \
       --prefix LD_LIBRARY_PATH ':' ${lib.makeLibraryPath runtimeLibs}
+  '' + lib.optionalString stdenv.isDarwin ''
+    # https://github.com/libretro/RetroArch/blob/master/retroarch-apple-packaging.sh
+    app=$out/Applications/RetroArch.app
+    mkdir -p $app/Contents/MacOS
+    cp -r pkg/apple/OSX/* $app/Contents
+    cp $out/bin/retroarch $app/Contents/MacOS
+    # FIXME: using Info_Metal.plist results in input not working
+    # mv $app/Contents/Info_Metal.plist $app/Contents/Info.plist
+
+    substituteInPlace $app/Contents/Info.plist \
+      --replace '${"\${EXECUTABLE_NAME}"}' 'RetroArch' \
+      --replace '$(PRODUCT_BUNDLE_IDENTIFIER)' 'com.libretro.RetroArch' \
+      --replace '${"\${PRODUCT_NAME}"}' 'RetroArch' \
+      --replace '${"\${MACOSX_DEPLOYMENT_TARGET}"}' '10.13'
+
+    cp media/retroarch.icns $app/Contents/Resources/
   '';
 
   preFixup = "rm $out/bin/retroarch-cg2glsl";
 
+  # Workaround for the following error affecting newer versions of Clang:
+  # ./config.def.h:xxx:x: error: 'TARGET_OS_TV' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_]
+  NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang [ "-Wno-undef-prefix" ];
+
   meta = with lib; {
     homepage = "https://libretro.com";
     description = "Multi-platform emulator frontend for libretro cores";
@@ -115,8 +135,5 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     changelog = "https://github.com/libretro/RetroArch/blob/v${version}/CHANGES.md";
     maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ];
-    # FIXME: exits with error on macOS:
-    # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting
-    broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/applications/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix
index b3797c9e9e36..6adcb8ffd8b4 100644
--- a/pkgs/applications/emulators/retroarch/wrapper.nix
+++ b/pkgs/applications/emulators/retroarch/wrapper.nix
@@ -8,8 +8,7 @@ stdenv.mkDerivation {
 
   buildCommand = ''
     mkdir -p $out/lib
-    for coreDir in $cores
-    do
+    for coreDir in $cores; do
       ln -s $coreDir/* $out/lib/.
     done
 
@@ -29,9 +28,14 @@ stdenv.mkDerivation {
 
   meta = with retroarch.meta; {
     inherit changelog description homepage license maintainers platforms;
-    longDescription =
-      "RetroArch is the reference frontend for the libretro API. The following cores are included: "
-      + lib.concatStringsSep ", " (map (x: "${x.name}") cores)
-      + ".";
+    longDescription = ''
+      RetroArch is the reference frontend for the libretro API.
+
+      The following cores are included:
+      ${lib.concatStringsSep "\n" (map (x: "  - ${x.name}") cores)}
+    '';
+    # FIXME: exits with error on macOS:
+    # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting
+    broken = stdenv.isDarwin;
   };
 }

From e0eeb37b38212ff33379d26650131a3af3bc3de5 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 9 Mar 2022 18:37:05 +0000
Subject: [PATCH 02/10] retroarch: 1.10.0 -> 1.10.1

---
 .../emulators/retroarch/default.nix           | 10 ++---
 .../disable-menu-show-core-updater.patch      | 13 -------
 ...h => disable-menu_show_core_updater.patch} |  2 +-
 ...e-fixed-paths-on-libretro_info_path.patch} | 38 ++++++++++---------
 4 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch
 rename pkgs/applications/emulators/retroarch/{0001-Disable-menu_show_core_updater.patch => disable-menu_show_core_updater.patch} (92%)
 rename pkgs/applications/emulators/retroarch/{0002-Use-fixed-paths-on-libretro_info_path.patch => use-fixed-paths-on-libretro_info_path.patch} (75%)

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 <thiagokokada@gmail.com>
 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 <thiagokokada@gmail.com>
-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
 

From f5241283fd965edfcbf33e6e6bbca1e22adc036f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 9 Mar 2022 19:52:28 +0000
Subject: [PATCH 03/10] libretro: unstable-2022-01-21 -> unstable-2022-03-09

---
 .../emulators/retroarch/cores.nix             |   2 +-
 .../emulators/retroarch/hashes.json           | 208 +++++++++---------
 2 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index e0045a3827d1..577c470c1605 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -55,7 +55,7 @@ let
     , license
     , src ? (getCoreSrc core)
     , broken ? false
-    , version ? "unstable-2022-01-21"
+    , version ? "unstable-2022-03-09"
     , platforms ? retroarch.meta.platforms
       # The resulting core file is based on core name
       # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 1280f25047d8..3c939fdf046f 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -14,32 +14,32 @@
     "beetle-lynx": {
         "owner": "libretro",
         "repo": "beetle-lynx-libretro",
-        "rev": "8930e88a4342945c023cbf713031a65de11a8e75",
-        "sha256": "bg/a+9ZJNTUIuEHKrFIss8sia3JWMWXIXbxha5qKVeI="
+        "rev": "26d94696eb005499d981970f052fdd7beda12c1e",
+        "sha256": "BUt8a/qFOIJezmTBQPha0VV1mW5CTkvB6DqzVVMBgQI="
     },
     "beetle-ngp": {
         "owner": "libretro",
         "repo": "beetle-ngp-libretro",
-        "rev": "f7c393184e5228c3d3807ee74c951c4c549107d8",
-        "sha256": "7vki8VkwOzxwMZcUxekg1DFSskV7VNQ1SRaU3M1xHZ0="
+        "rev": "6abc74d9dc6a86460ab71c93c153fe1cb8ef4dbb",
+        "sha256": "+p3MwlzwwTghIKTDMzkqGlxhZiy/Px7xaDK3a0JagUE="
     },
     "beetle-pce-fast": {
         "owner": "libretro",
         "repo": "beetle-pce-fast-libretro",
-        "rev": "0f43fd4dc406e7da6bbdc13b6eb1c105d6072f8a",
-        "sha256": "u1lOgXEYuGAF4sOLdsBzcA4/A5Yz1b82TjFBiM57yE4="
+        "rev": "e8801687f232a6f8828b3ff5dadbc9fe1b0076fc",
+        "sha256": "YM+URLnMqsdmk/5yqCg8U4mPpgtmj5qne2CrbTpTeN8="
     },
     "beetle-pcfx": {
         "owner": "libretro",
         "repo": "beetle-pcfx-libretro",
-        "rev": "6d2b11e17ad5a95907c983e7c8a70e75508c2d41",
-        "sha256": "WG2YpCYdL/MxW5EbiP2+1VtAjbX7yYDIcLXhb+YySI4="
+        "rev": "00abc26cafb15cc33dcd73f4bd6b93cbaab6e1ea",
+        "sha256": "4a1wV3WKZmg1ed3BD0PN0Ap9E9XahQtilRWTGV5Ns3g="
     },
     "beetle-psx": {
         "owner": "libretro",
         "repo": "beetle-psx-libretro",
-        "rev": "297970e4ff080ea80a5670209aeea4fde8059020",
-        "sha256": "6kZher3/+5ywXyC3n9R9JVA4IVLZBaSfAcWEKp2SsDE="
+        "rev": "88929ae90b4807a41b1b240377ab440e39ecf2cc",
+        "sha256": "5AX5FPsmsqGWCNzLgJ7lsekZaIdano2j5sb4qUkD4cQ="
     },
     "beetle-saturn": {
         "owner": "libretro",
@@ -56,20 +56,20 @@
     "beetle-supergrafx": {
         "owner": "libretro",
         "repo": "beetle-supergrafx-libretro",
-        "rev": "7bae6fb1a238f1e66b129c7c70c7cb6dbdc09fa1",
-        "sha256": "OAJ86XrwjDrgCjrk0RHMn8sHYaJFhJhLaQnhaEVXN38="
+        "rev": "59991a98c232b1a8350a9d67ac554c5b22771d3c",
+        "sha256": "zv3dAPWrj6hkNaFQ5vUKm5Orcrb2XO48WSkAFiAVUO0="
     },
     "beetle-vb": {
         "owner": "libretro",
         "repo": "beetle-vb-libretro",
-        "rev": "aa77198c6c60b935503b5ea2149b8ff7598344da",
-        "sha256": "ShsMYc2vjDoiN1yCCoSl91P5ecYJDj/V+VWUYuYVxas="
+        "rev": "2ebf072fc4c00d428142f8073d4bef94de78b973",
+        "sha256": "e46G5AiSA3QEvNhiMIX8huw33XC10byV3Rksu0kj5Rg="
     },
     "beetle-wswan": {
         "owner": "libretro",
         "repo": "beetle-wswan-libretro",
-        "rev": "5717c101b314f64d4c384c23b1934d09fcbf82bb",
-        "sha256": "Nfezb6hja1qHv1fMGU9HMbbb56GHAfe/zIgRqrzz334="
+        "rev": "8f9fc6bd7afa7f7741ccba63fc27192d522de4b9",
+        "sha256": "DVuuILS4m0cMDjKQ99VU2HG60y4tFhGKwgDCrFNLp6E="
     },
     "blastem": {
         "owner": "libretro",
@@ -80,14 +80,14 @@
     "bluemsx": {
         "owner": "libretro",
         "repo": "bluemsx-libretro",
-        "rev": "5dfdb75106e10ef8bc21b8bcea1432ecbd590b2a",
-        "sha256": "0D0xufIt3qmQ+/UjyWynoLyLDSza8cTrFp3UwGWBXko="
+        "rev": "92d0c41b4973854114c7b2d06ab727a266d404c5",
+        "sha256": "dL4k+zG8L4KK4lwf9eXPVGk/u5xQn2htIEpoKyj9kQI="
     },
     "bsnes": {
         "owner": "libretro",
         "repo": "bsnes-libretro",
-        "rev": "1b2987ab1e9caf5c8d7550da01ffa08edff2f128",
-        "sha256": "l6Jvn0ZgFaKSWjiV2bN9aemxLyfnNEQFc+HS1/MuiaY="
+        "rev": "26c583e1c5d09253b6c61e2b9d418e8758eef632",
+        "sha256": "Qa0ScFHcEgBUoWouNoW4JINZ2aHjNATndxhcwKw476Q="
     },
     "bsnes-hd": {
         "owner": "DerKoun",
@@ -98,14 +98,14 @@
     "bsnes-mercury": {
         "owner": "libretro",
         "repo": "bsnes-mercury",
-        "rev": "d232c6ea90552f5921fec33a06626f08d3e18b24",
-        "sha256": "fpl7hmqz+Ca+9ZeM6E1JSikbiu+NJUU8xXtyl6Dd9Gg="
+        "rev": "96455ef8dab27a44ffc2dd9ab4f859464423017b",
+        "sha256": "sCowNiCp+g5w8Tgfrj5zf/L1cjPLUK1kGmGmH8mtBkU="
     },
     "citra": {
         "owner": "libretro",
         "repo": "citra",
-        "rev": "b1959d07a340bfd9af65ad464fd19eb6799a96ef",
-        "sha256": "bwnYkMvbtRF5bGZRYVtMWxnCu9P45qeX4+ntOj9eRds=",
+        "rev": "60406d34ed9c0e04a29eb0b83089e727a72162b9",
+        "sha256": "t25ekNUCPoj76fzIXfMvBO1kAJi8FsqxIi+0l9w2OtA=",
         "fetchSubmodules": true,
         "leaveDotGit": true,
         "deepClone": true
@@ -134,8 +134,8 @@
     "dolphin": {
         "owner": "libretro",
         "repo": "dolphin",
-        "rev": "3b19e6d1781584f3e1fd2922b48b8ae6b3bcb686",
-        "sha256": "EcgJhkMzdZfYRwSpU1OcsJqQyq4V8dq5PndVufZFy7k="
+        "rev": "6f22ef47d180aeffac69942a205f79f20b2c8892",
+        "sha256": "zXKciPeqYng04HjPimmxcm9c6+K90PGumuke/lXmldc="
     },
     "dosbox": {
         "owner": "libretro",
@@ -158,44 +158,44 @@
     "fbneo": {
         "owner": "libretro",
         "repo": "fbneo",
-        "rev": "4ecf2782a4eee042d1e126d1671e5231b6437b6e",
-        "sha256": "15MYI03r45mmRsXCwzWnjfBdtzSaHLp7DfmcACQFTvU="
+        "rev": "384d3837faa3e66d0641d60e9760c477ffb94495",
+        "sha256": "AABcE/0pqeHmc1CamvEC4ycekJbVqu8DAfCzIQpF/as="
     },
     "fceumm": {
         "owner": "libretro",
         "repo": "libretro-fceumm",
-        "rev": "eb06d17e7912780a3ee117ae73bc50c3948c761c",
-        "sha256": "aBqskJtK1bFBjwaoo9hilr33fyAWsdj5+hFC3WY3sKk="
+        "rev": "f52037ad7a558d1e8765d448a34d85569e4ca822",
+        "sha256": "U6iubdMntJ9T+Cw8lP4CPJDjhDYfxzMgWnxrACgPjAw="
     },
     "flycast": {
         "owner": "libretro",
         "repo": "flycast",
-        "rev": "0d8c6a2e717c002bc76ce26a152353b004fb15e7",
-        "sha256": "t2RGHAyYXeHVqTqqhayOUWx/msFN9q/Z9P2wXJUtQTI="
+        "rev": "886188804de48a4bd9324046598e8dedfd0d2099",
+        "sha256": "Wxn1zEQElwLRSND4iLcIdSmiurj0WRdDgf5BfpomD9o="
     },
     "fmsx": {
         "owner": "libretro",
         "repo": "fmsx-libretro",
-        "rev": "dfcda056896576c6a1c75c002a82d0e6c1160ccc",
-        "sha256": "9ANZ1suAQcYOhqSchQ20Yuqvgw06j5Sd3Z1fjrp2UFc="
+        "rev": "f9ea9eacd49297783c216d147dcc1a22465b2749",
+        "sha256": "nDsaaUeZUm4zTj07+2nPDefoDpw18vXdhQr1BH6/4eY="
     },
     "freeintv": {
         "owner": "libretro",
         "repo": "freeintv",
-        "rev": "d58caf23ed1438a1db58f8d6ac24ca521b411d3b",
-        "sha256": "nUV+A3Zh66M1K5NDK0ksNF5H1HS3AQdeYLaGfaA34n4="
+        "rev": "22152376f891de3dc1a26b9635fd8318980d6385",
+        "sha256": "jG6/eO2BO0cHPZc1rVMxgrcfj70SwRbFn5eKdwEpT7k="
     },
     "gambatte": {
         "owner": "libretro",
         "repo": "gambatte-libretro",
-        "rev": "79bb2e56d034c30d8dcac02b6c34a59ec8fe91bc",
-        "sha256": "H+Hkeep18whaSYbyG8DcaJqsVVu7DEX9T28pkfXfyCg="
+        "rev": "671c82eaa6c4e3e28fefb583586f78d3e7b0005d",
+        "sha256": "2hvkMHme8hyP93tGsdPQXpovPk5Ne9UzcYGUizEDsyc="
     },
     "genesis-plus-gx": {
         "owner": "libretro",
         "repo": "Genesis-Plus-GX",
-        "rev": "88c9ad000ba553b9c819d9eb259f741fabd877bb",
-        "sha256": "8ZCMq8/sk5TqwTNWMfDevZHRPSOM1PJ57kiZZ7qfQxA="
+        "rev": "ed5c591fb2319f12b1058a6f138766d5fdcdd0d8",
+        "sha256": "qluSLdETg4XCIC2LQvhFCr9L+KvTYiYfaIRUnpJDRik="
     },
     "gpsp": {
         "owner": "libretro",
@@ -206,14 +206,14 @@
     "gw": {
         "owner": "libretro",
         "repo": "gw-libretro",
-        "rev": "0f1ccca156388880bf4507ad44741f80945dfc6f",
-        "sha256": "BVpx8pL224J2u9W6UDrxzfEv4qIsh6wrf3bDdd1R850="
+        "rev": "fc3d8d355b45466c52f8c56a8bcd395b702b310b",
+        "sha256": "kl7+StKOW7Yri7Q4O5BaxwVBIev9NLGWh0NYvyXZF20="
     },
     "handy": {
         "owner": "libretro",
         "repo": "libretro-handy",
-        "rev": "3b02159ba32aa37c1b93d7f7eac56b28e3715645",
-        "sha256": "mBKK+pdWgkxYkV4OOiBrlWbLAMugDX0fd6QRh0D7JYU="
+        "rev": "5145f79bb746f6d9c0b340c2f9cc4bf059848924",
+        "sha256": "madTjJWKM8elM35LRAwm0RwnA44skLtIK2/7RXPSNl0="
     },
     "hatari": {
         "owner": "libretro",
@@ -224,26 +224,26 @@
     "mame": {
         "owner": "libretro",
         "repo": "mame",
-        "rev": "2f9c793a77222ae46266c71f64d491cf7870dc1e",
-        "sha256": "WAhm6QMMVbnuSIK4PW7Ek+AAkMs7s95gGb6ERzlon0w="
+        "rev": "1f6e6075e9668f55d93c5ef4fa3b032c00c0b305",
+        "sha256": "9mnmnzqlE2ixeNSq8406N9xvUKWKVyRjfZ4atTKRt80="
     },
     "mame2000": {
         "owner": "libretro",
         "repo": "mame2000-libretro",
-        "rev": "4793742b457945afb74053c8a895e6ff0b36b033",
-        "sha256": "DA9fZTic/jlYzSAIiOjfhohyEyQZiBNdIa8YCZoKZNs="
+        "rev": "098df85e3bc04a74db8c810d51fb72879594dc40",
+        "sha256": "VvmDjgR3kgpfPBjo5wUPvxo4mYmpcdE2tlmRbwoGlQE="
     },
     "mame2003": {
         "owner": "libretro",
         "repo": "mame2003-libretro",
-        "rev": "dbda6ddacdd8962cfea25000421dba398e551aef",
-        "sha256": "RSL3iZZEJCxOtsJqjnM5ZiT0yM2nAgg/Ujq6FBLMHkk="
+        "rev": "3eb27d5f161522cf873c0642f14b8e2267b3820f",
+        "sha256": "TQ4FwboKeEP58hOL2hYs4OYes2o0wSKFSp4CqZV5r6I="
     },
     "mame2003-plus": {
         "owner": "libretro",
         "repo": "mame2003-plus-libretro",
-        "rev": "9c0c954f0f88730f44abdd4d414691fef6b1cd7c",
-        "sha256": "NLdHc0VuZhqQhAzv+8kipc0mhqT2BNaJeLYZUx7DwRU="
+        "rev": "6147fc1c8b759eb03110ddc71a21c2dbb3f5a685",
+        "sha256": "JAnOx4KOERdYFPga/jWR3Bx5x284JnVzfuspi9jDUEM="
     },
     "mame2010": {
         "owner": "libretro",
@@ -266,14 +266,14 @@
     "melonds": {
         "owner": "libretro",
         "repo": "melonds",
-        "rev": "0053daa700018657bf2e47562b3b4eb86f9b9d03",
-        "sha256": "K6ZYuk7cE+ioq1rLRyAKNQxddCYIOXLU5SXT7sYgGnc="
+        "rev": "e93ec3e462d3dfc1556781510a3cee113f02abb2",
+        "sha256": "NDrsqX17OKw1/PIZSrWAxhVl+Qk/xG7lCnr6Ts+7YJ4="
     },
     "mesen": {
         "owner": "libretro",
         "repo": "mesen",
-        "rev": "094d82bf724448426acbaad45e83bc38994e32f6",
-        "sha256": "9+AqZRv8lugNNa+ZZzIPJNO87J1aBUEiOggL8aYno1M="
+        "rev": "7376e98b8b3a6ef4c9e5c8dd34b65554d322019c",
+        "sha256": "9l8fek3Npm8adBQjkMFAnZs6IeLNjeeprbuXEcfRiHw="
     },
     "mesen-s": {
         "owner": "libretro",
@@ -290,32 +290,32 @@
     "mgba": {
         "owner": "libretro",
         "repo": "mgba",
-        "rev": "43da6e1d54ad0395f474346db88fe59a4c0aa451",
-        "sha256": "JxiWIBQi1fZoBV2lvx2r7iIvlQm0BYuJFz0TsxngUT8="
+        "rev": "5d48e0744059ebf38a4e937b256ffd5df4e0d103",
+        "sha256": "OYw2nlldFx5B7WX0E8Gbgfp1j4h65ZxyKDS9tneHXQg="
     },
     "mupen64plus": {
         "owner": "libretro",
         "repo": "mupen64plus-libretro-nx",
-        "rev": "350f90a73cf0f5d65357ce982ccbaa3b22fc3569",
-        "sha256": "9Hq93+dvO60LBbcXLIHsTq243QThicI0rVJW3tou/5Y="
+        "rev": "6e9dcd2cd9d23d3e79eaf2349bf7e9f25ad45bf1",
+        "sha256": "rs/VL2K6aS8Rl01IyxUiWipzLEzg+7+fbXxI0qN5X/I="
     },
     "neocd": {
         "owner": "libretro",
         "repo": "neocd_libretro",
-        "rev": "83d10f3be10fff2f28aa56fc674c687528cb7f5c",
-        "sha256": "yYZGoMsUfE8cpU9i826UWQGi1l0zPJPcBDb2CINxGeQ="
+        "rev": "3aa984f8d951ed43240a97233879b7063ea808e8",
+        "sha256": "+k0pOOZR8lbBEEQoqC5+TEG6HKNAK+DMTiOb9fwIBDw="
     },
     "nestopia": {
         "owner": "libretro",
         "repo": "nestopia",
-        "rev": "8af07b7ab49e45495cbc4ba73cd2f879d9908b55",
-        "sha256": "Z447flP1L/7gWEovWhbBearPKzsZNnGE2cz7jH7kEnY="
+        "rev": "a05e5bce06177c73de6bd233973ed718566e3f9a",
+        "sha256": "U7BkEZl8G/jtqvwCSRIWoqOz3ZyiGAOz65hfLoCoDeM="
     },
     "np2kai": {
         "owner": "AZO234",
         "repo": "NP2kai",
-        "rev": "30d4b6959c48db039207a37e278c868c7737ed69",
-        "sha256": "uIcgbpcEz6yUKrBe0r84Yq2ihWfT0+TdUTIF5kMT5mI=",
+        "rev": "2b09ea6a589cdcae27bca27160b3f82638fbb45d",
+        "sha256": "M3kGA1TU3xui6of9XgUspI+Zf+hjYP1d2mgKwxsy3IQ=",
         "fetchSubmodules": true
     },
     "o2em": {
@@ -339,53 +339,53 @@
     "pcsx2": {
         "owner": "libretro",
         "repo": "pcsx2",
-        "rev": "3ef2a36b0608e9dcae808c7ef01c7a760d628735",
-        "sha256": "ezqVntonhGfejiGx9cxQEnjsXEHqT++M1fO0Jz1t/Us="
+        "rev": "7874ca39eb3fe11b3b967dc97e0d08f1bc945d22",
+        "sha256": "CCzIksku5RYXBiQUE2f3fkenvuDHAlwkVLjXd4dem+4="
     },
     "pcsx_rearmed": {
         "owner": "libretro",
         "repo": "pcsx_rearmed",
-        "rev": "12fc12797064599dfca2d44043d5c02a949711ef",
-        "sha256": "SXmNfHGyk+KChiwkKlA+d/oezzp/7p1DJY+w2bES6kg="
+        "rev": "40b19b536c6af2474d679d7ec1a529fcbe17a87c",
+        "sha256": "njOSlrXAPu4LlKKgJ4nBq9VCLnxTexU3SO7cBKtG4oA="
     },
     "picodrive": {
         "owner": "libretro",
         "repo": "picodrive",
-        "rev": "50b8b47838fea8096535d543caaacdcc56aa7df2",
-        "sha256": "C1Htwel5PHZcjkKmjiiN/QgRofMhqlArxktOSqoTxTc=",
+        "rev": "6a0f515f95ea2080c8ac6b0bd2c194b48d991892",
+        "sha256": "d0n0Qj4/6MdM2Ekt9mlz9wTpVC+xjiQ4RAkmUmDeYyM=",
         "fetchSubmodules": true
     },
     "play": {
         "owner": "jpd002",
         "repo": "Play-",
-        "rev": "fd6a5161030215090d48a8036680f57914c71bb0",
-        "sha256": "g6UBRV7biLjPBXdlejjXUSk3v1wrsYWA3quZlpPj23U=",
+        "rev": "26bdfebf5b7458fc05061f35233fe5e11f2a9297",
+        "sha256": "BSttx6nhCc0dyqq5b3WLewz8A8PgF2Xu4RM1YQEm4lI=",
         "fetchSubmodules": true
     },
     "ppsspp": {
         "owner": "hrydgard",
         "repo": "ppsspp",
-        "rev": "54d63cc1daf2a0cdc812e9af85854bb4ae5ef399",
-        "sha256": "iB/8zf4FYdsbiKZVq/YISTEQSoo1kme1uZsyuhbOcoc=",
+        "rev": "2abe3d615293bdee0cc32d6dd7719bc238e8c107",
+        "sha256": "uO6GVBIIPC0yFw0jjYFOu5y4SQ2zmw8LuKIhHebwvcs=",
         "fetchSubmodules": true
     },
     "prboom": {
         "owner": "libretro",
         "repo": "libretro-prboom",
-        "rev": "af1b5bf89d01095326ee27e178f9257f9e728873",
-        "sha256": "pvTUv4E+wBOYfjz8Ph11CK4E7rIm1T+u90TWDNXEBIU="
+        "rev": "4191903047650b40476f7f7584f4e2248789e4b7",
+        "sha256": "lQtIXsT7K9sPoeDobFFCKA0bj1WGmPezpcEfQCp6QEU="
     },
     "prosystem": {
         "owner": "libretro",
         "repo": "prosystem-libretro",
-        "rev": "89e6df7b60d151310fedbe118fb472959a9dcd61",
-        "sha256": "uxgKddS53X7ntPClE8MGezBAG+7OAFvMXTnyKpOOau0="
+        "rev": "fbf62c3dacaac694f7ec26cf9be10a51b27271e7",
+        "sha256": "Opb6CUeT/bnaTg4MJo7DNsVyaPa73PLbIor25HHWzZ0="
     },
     "quicknes": {
         "owner": "libretro",
         "repo": "QuickNES_Core",
-        "rev": "743e6e06db246c5edab27c738c7a573d83140485",
-        "sha256": "NYmP+HFeZGUeIRaT3bzdpWw9cmEAaBkA3EGnw/zpDXA="
+        "rev": "e6f08c165af45fc2d2f26c80ba0cfc33e26f9cfe",
+        "sha256": "JQtlqN3mvIwKy6iN9opHPHnh0E7AIn9JVitIfXklI/I="
     },
     "sameboy": {
         "owner": "libretro",
@@ -402,50 +402,50 @@
     "smsplus-gx": {
         "owner": "libretro",
         "repo": "smsplus-gx",
-        "rev": "3f1ffede55bcfe0168caa484a00bf041ab591abf",
-        "sha256": "fD+grzMPk4uXvmzGf+f9Mor0eefBLHIumCydsSHUsck="
+        "rev": "ed5ec9e540934f8afb08b1c0aced226f8f797885",
+        "sha256": "GgrNBFjIdAg+IV/YNxB/CgvOxUo/J20j0rWfhP7fxak="
     },
     "snes9x": {
         "owner": "snes9xgit",
         "repo": "snes9x",
-        "rev": "34b6160805c4995a8edf5f9b3328f5e492ae4c44",
-        "sha256": "YRRqtd5iu2evRk+7SyQpqpxqTaEFOkDZ/XQHEjpSBcM="
+        "rev": "0a94eaa6dc578a8d099f17af09cca9ce03de0877",
+        "sha256": "al8pKJxgOoL873Yfy9ony63x02ritTVUUp5C2qU67v0="
     },
     "snes9x2002": {
         "owner": "libretro",
         "repo": "snes9x2002",
-        "rev": "e16cb16efa00765b1bc3b8fee195680efb1542c7",
-        "sha256": "0dhLpNy+NUE3mE/ejEwbq3G28/a2HONS5NPslI5LOEc="
+        "rev": "ef4fa1dddd1c3ed6887d81898ac10c9e210ae84b",
+        "sha256": "gcVM1ip7PvOuEr/2kKWQ+ky1ErkJmENqteyysPX/P0I="
     },
     "snes9x2005": {
         "owner": "libretro",
         "repo": "snes9x2005",
-        "rev": "77e9cd293c791b47f4397da0a47242b329243cb5",
-        "sha256": "iHGfZIGzE4n3EHrVRxTULuYKsOse5NcJftmasoJFwFo="
+        "rev": "abd072aa370620112a88cc7b350c2dfb1b58185a",
+        "sha256": "14XDe0D84xpI53o/HqxlhWUW0MW7sD5dGRZjXXtE2Ac="
     },
     "snes9x2010": {
         "owner": "libretro",
         "repo": "snes9x2010",
-        "rev": "714b1c8e08c7580430190119b07e793405773ac2",
-        "sha256": "yKSQEE+lT4V2V1XqemfziHuIt79TcvC0ranU9ounTXo="
+        "rev": "f422fcf58320e8cce5aad2abd227f2461251222a",
+        "sha256": "93/TT8tHsDntUoW4qCSAFlinUYUZasHb1vCGGkq+oJM="
     },
     "stella": {
         "owner": "stella-emu",
         "repo": "stella",
-        "rev": "1db9de390a331a7d55c35591c93d9e89184cce5f",
-        "sha256": "vICKxx+UBYvMzZ3a3F86yzJRKfdo0jMxa27wsUX0KZw="
+        "rev": "279cffe7b74909ec936bb44a4c70e98d50cc8420",
+        "sha256": "jmtNEDZmw90eCfGBaAuxYz5zjgjQ0QYPdYWKXPIDOL0="
     },
     "stella2014": {
         "owner": "libretro",
         "repo": "stella2014-libretro",
-        "rev": "934c7a2a44ef038af529b68950ddba4f7ea3478e",
-        "sha256": "s7LQ47sAPTyk4COONk4qnebxCq78zGLIjh3Y2+1fIak="
+        "rev": "1a2e96bc6ccf91de6fb4322048da05f67a9d21d4",
+        "sha256": "yINO6EU2kCldfxKcqym5ha3uIEQg7I6t4Wmu+8b6Hmw="
     },
     "swanstation": {
         "owner": "libretro",
         "repo": "swanstation",
-        "rev": "61c5debe60192b0fecd8c15310b2e4c4473f9438",
-        "sha256": "DZJApJnGDMsUhjO35TBc7tMldCGKDPPtrwxPLe0Ey1s="
+        "rev": "74b958ceae11a1b72ba17d5b783b5eb1a6166701",
+        "sha256": "ge2jhOQmBs+MmWCcdfrn3gshS7ABAnLo5iyKi37wbRY="
     },
     "tgbdual": {
         "owner": "libretro",
@@ -462,8 +462,8 @@
     "tic80": {
         "owner": "libretro",
         "repo": "tic-80",
-        "rev": "967eb78c3610385a0e6cba8bb5c60ebc3b886d3e",
-        "sha256": "N0QFNTYFVbhWwt2yx5fLM7Dl6pJZPYrt9o3+6rjnWa8=",
+        "rev": "510fcacef43b662b9fc4586528482048eaeb7fb4",
+        "sha256": "BYwrdeaUHoX60alH2i1CgyWsHE5qopUTB1pw1n6FN+w=",
         "fetchSubmodules": true
     },
     "vba-m": {
@@ -487,13 +487,13 @@
     "virtualjaguar": {
         "owner": "libretro",
         "repo": "virtualjaguar-libretro",
-        "rev": "d1b1b28a6ad2518b746e3f7537ec6d66db96ec57",
-        "sha256": "Io25dt80fqIqIxwzF2DK9J5UFz6YCUQoqThcIuxdEBo="
+        "rev": "263c979be4ca757c43fb525bd6f0887998e57041",
+        "sha256": "6Q6Y0IFUWS9ZPhnAK3EUo4hMGPdBn8eNEYCK/zLgAKU="
     },
     "yabause": {
         "owner": "libretro",
         "repo": "yabause",
-        "rev": "f30153ff9e534b96049c6f1ac3075b572642ceb5",
-        "sha256": "AdqCr5X3Bq8ic2jkIestmYi+CBByZ5Fyf0BUYwBkWnA="
+        "rev": "17dfcd8de4700341d972993501d3a043925675ce",
+        "sha256": "xwW7Oe3Cy3yC0xC5acLW6OGUIG+dKd1mwiXK5ZAumdo="
     }
 }

From 19ea6302e381835fe1fc19cdfaced7d83c4e47d8 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 30 Mar 2022 12:01:30 +0100
Subject: [PATCH 04/10] retroarch: 1.10.1 -> 1.10.2

---
 pkgs/applications/emulators/retroarch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix
index 601ff014b026..c32f46cf2665 100644
--- a/pkgs/applications/emulators/retroarch/default.nix
+++ b/pkgs/applications/emulators/retroarch/default.nix
@@ -35,11 +35,11 @@
 }:
 
 let
-  version = "1.10.1";
+  version = "1.10.2";
   libretroCoreInfo = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-core-info";
-    sha256 = "sha256-9HpfzVv1XG5fE15yM+XiVWjr+fE3xj7oRYp0LHZ/3Xg=";
+    sha256 = "sha256-XOSIVH3BSwAFKUeRvyYc2OXDa+TLjoKVGl+b8fgnvtY=";
     rev = "v${version}";
   };
   runtimeLibs = lib.optional withVulkan vulkan-loader
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "RetroArch";
-    sha256 = "sha256-E0tY5YRBcew6NIVDgTNGBuxSRR0qM9bCBE+gYn61eQQ";
+    sha256 = "sha256-fMsHMQiEoXeFKITxeEyRH829z5SCf8p0Hxq6ww1p3z4=";
     rev = "v${version}";
   };
 

From fea4c06edeed4ba4ff899c15b76fa713043d3637 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Wed, 30 Mar 2022 12:53:18 +0100
Subject: [PATCH 05/10] libretro: unstable-2022-03-09 -> unstable-2022-04-05

---
 .../emulators/retroarch/cores.nix             |   2 +-
 .../emulators/retroarch/hashes.json           | 168 +++++++++---------
 2 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 577c470c1605..ddf81d9066c5 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -55,7 +55,7 @@ let
     , license
     , src ? (getCoreSrc core)
     , broken ? false
-    , version ? "unstable-2022-03-09"
+    , version ? "unstable-2022-04-05"
     , platforms ? retroarch.meta.platforms
       # The resulting core file is based on core name
       # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 3c939fdf046f..7e5ecbe1a230 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -2,8 +2,8 @@
     "atari800": {
         "owner": "libretro",
         "repo": "libretro-atari800",
-        "rev": "478a8ec99a7f8436a39d5ac193c5fe313233ee7b",
-        "sha256": "LJpRegJVR2+sS1UmTTpVest0rMrNDBMXmj/jRFVglWI="
+        "rev": "beab30e7ea10b7ed14d0514064f47d16f76cd995",
+        "sha256": "r9MsnasNhhYdFyr2VHJXkTXssB5U00JW6wN/+i+SNUk="
     },
     "beetle-gba": {
         "owner": "libretro",
@@ -14,8 +14,8 @@
     "beetle-lynx": {
         "owner": "libretro",
         "repo": "beetle-lynx-libretro",
-        "rev": "26d94696eb005499d981970f052fdd7beda12c1e",
-        "sha256": "BUt8a/qFOIJezmTBQPha0VV1mW5CTkvB6DqzVVMBgQI="
+        "rev": "de0d520d679cb92767876d4e98da908b1ea6a2d6",
+        "sha256": "BszU5bnlHBOwQSZOM9P4WIP863rS5RluNWvGBFxqzYs="
     },
     "beetle-ngp": {
         "owner": "libretro",
@@ -44,8 +44,8 @@
     "beetle-saturn": {
         "owner": "libretro",
         "repo": "beetle-saturn-libretro",
-        "rev": "e6ba71f8bcc647b646d94dec812b24d00c41cf3f",
-        "sha256": "tDbV+CsDr4bowBbJ/C8J9scfCryTAXxz58pGaUHU5yU="
+        "rev": "ae30f29e340a00b33e38df85ceaa599151a47cd7",
+        "sha256": "nc239PRM/TfkZMWm4Zl5kSoZBQcrMcMudupvCJtTBlc="
     },
     "beetle-snes": {
         "owner": "libretro",
@@ -62,8 +62,8 @@
     "beetle-vb": {
         "owner": "libretro",
         "repo": "beetle-vb-libretro",
-        "rev": "2ebf072fc4c00d428142f8073d4bef94de78b973",
-        "sha256": "e46G5AiSA3QEvNhiMIX8huw33XC10byV3Rksu0kj5Rg="
+        "rev": "a91437af0879124aa00b6cb30ca1189f2c84b7cb",
+        "sha256": "ryahr/g6PDvUKCPkF1D8xozNGNCa4bLw63b5Ra9Vsfo="
     },
     "beetle-wswan": {
         "owner": "libretro",
@@ -98,14 +98,14 @@
     "bsnes-mercury": {
         "owner": "libretro",
         "repo": "bsnes-mercury",
-        "rev": "96455ef8dab27a44ffc2dd9ab4f859464423017b",
-        "sha256": "sCowNiCp+g5w8Tgfrj5zf/L1cjPLUK1kGmGmH8mtBkU="
+        "rev": "60431e0507c3492c4d6e4f950c4e551fe4e7e57d",
+        "sha256": "EAvBEFY0I4960DohDOShgu0Jfnww9B6bf6wPxVi7Ogg="
     },
     "citra": {
         "owner": "libretro",
         "repo": "citra",
-        "rev": "60406d34ed9c0e04a29eb0b83089e727a72162b9",
-        "sha256": "t25ekNUCPoj76fzIXfMvBO1kAJi8FsqxIi+0l9w2OtA=",
+        "rev": "44e01f99016008eff18bc7a28234d1098382358d",
+        "sha256": "iUp8O0hGCyrbVGoKb95Z3MuFlEzjvaLhgWxo8hAOLIk=",
         "fetchSubmodules": true,
         "leaveDotGit": true,
         "deepClone": true
@@ -122,8 +122,8 @@
     "desmume": {
         "owner": "libretro",
         "repo": "desmume",
-        "rev": "7ea0fc96804fcd9c8d33e8f76cf64b1be50cc5ea",
-        "sha256": "4S/CirRVOBN6PVbato5X5fu0tBn3Fu5FEAbdf3TBqng="
+        "rev": "7b16293ebb8e272ce28d62efc39573b129cea61d",
+        "sha256": "WTUA0iOG5E8OuHjd+qbd4C5BoaN4WFYetPGj9r7CDpI="
     },
     "desmume2015": {
         "owner": "libretro",
@@ -134,38 +134,38 @@
     "dolphin": {
         "owner": "libretro",
         "repo": "dolphin",
-        "rev": "6f22ef47d180aeffac69942a205f79f20b2c8892",
-        "sha256": "zXKciPeqYng04HjPimmxcm9c6+K90PGumuke/lXmldc="
+        "rev": "61475de768fb7457128853656e53a942aedd79fe",
+        "sha256": "pInezsAtzVanlGHCQKraaqzWXWDYf/v5YYE7BS5yOAk="
     },
     "dosbox": {
         "owner": "libretro",
         "repo": "dosbox-libretro",
-        "rev": "aa71b67d54eaaf9e41cdd3cb5153d9cff0ad116e",
-        "sha256": "L0Y67UROjldnXUlLQ+Xbd7RHLb96jDxlB/k+LR9Kbas="
+        "rev": "1aff406faed3cfde5c1b658bacd9f8f639915912",
+        "sha256": "qRUXYd4oWRUFGAezs9Un+Avpx5Rwu1Ngjc80R5gise0="
     },
     "eightyone": {
         "owner": "libretro",
         "repo": "81-libretro",
-        "rev": "86d7d5afe98f16006d4b1fdb99d281f1d7ea6b2f",
-        "sha256": "QN7anzqv1z8SgY8dlkjr8Ns7reGWc7hTneiRmorXZSk="
+        "rev": "6aba19246c1ec08f3de5659b2dbc3277ec6bfb97",
+        "sha256": "2G6NkNlvqvP5RM35ydppnr2/RRbeiIpM2HKOpt8PkgU="
     },
     "fbalpha2012": {
         "owner": "libretro",
         "repo": "fbalpha2012",
-        "rev": "23f98fc7cf4f2f216149c263cf5913d2e28be8d4",
-        "sha256": "dAInW6tTV7oXcPhKMnHWcmQaWQCTqRrYHD2yuaI1I1w="
+        "rev": "7f8860543a81ba79c0e1ce1aa219af44568c628a",
+        "sha256": "r1lH+CR+nVRCPkVo0XwLi35/ven/FEkNhWUTA6cUVxc="
     },
     "fbneo": {
         "owner": "libretro",
         "repo": "fbneo",
-        "rev": "384d3837faa3e66d0641d60e9760c477ffb94495",
-        "sha256": "AABcE/0pqeHmc1CamvEC4ycekJbVqu8DAfCzIQpF/as="
+        "rev": "5ad211ca3d0cfc1945fee6dc260885f2ee661d79",
+        "sha256": "SHURJYmSR42uQyyqYGd071fRci9DZJ6KaD0ZWi3y/S4="
     },
     "fceumm": {
         "owner": "libretro",
         "repo": "libretro-fceumm",
-        "rev": "f52037ad7a558d1e8765d448a34d85569e4ca822",
-        "sha256": "U6iubdMntJ9T+Cw8lP4CPJDjhDYfxzMgWnxrACgPjAw="
+        "rev": "013c6f3b563261747dac316c2ece81a27f963c21",
+        "sha256": "OCtiMkiWvWZYyv+E5KSf06fIrcO9+ZjsUGOVVFWc/c8="
     },
     "flycast": {
         "owner": "libretro",
@@ -182,26 +182,26 @@
     "freeintv": {
         "owner": "libretro",
         "repo": "freeintv",
-        "rev": "22152376f891de3dc1a26b9635fd8318980d6385",
-        "sha256": "jG6/eO2BO0cHPZc1rVMxgrcfj70SwRbFn5eKdwEpT7k="
+        "rev": "295dd3c9e4b2d4f652f6a6a904afbe90a8187068",
+        "sha256": "tz0X6AfD7IL3Y50vjgSO5r6sDhu++6Gj8Rp7de5OqMk="
     },
     "gambatte": {
         "owner": "libretro",
         "repo": "gambatte-libretro",
-        "rev": "671c82eaa6c4e3e28fefb583586f78d3e7b0005d",
-        "sha256": "2hvkMHme8hyP93tGsdPQXpovPk5Ne9UzcYGUizEDsyc="
+        "rev": "15536214cdce31894d374b2ffa2494543057082b",
+        "sha256": "cTSoK6rezRajnuWPt7WkYn3SWL0sTu7h5X3Ig1KukDA="
     },
     "genesis-plus-gx": {
         "owner": "libretro",
         "repo": "Genesis-Plus-GX",
-        "rev": "ed5c591fb2319f12b1058a6f138766d5fdcdd0d8",
-        "sha256": "qluSLdETg4XCIC2LQvhFCr9L+KvTYiYfaIRUnpJDRik="
+        "rev": "144045b30a18ab4b27c3ae46490274988f302748",
+        "sha256": "ydnyPdkJmM+xhuJqIOxZISFcTN8RFgOLbnRvOBJORek="
     },
     "gpsp": {
         "owner": "libretro",
         "repo": "gpsp",
-        "rev": "e554360dd3ed283696fc607877024a219248b735",
-        "sha256": "ImsqB89XmjF8nvs7j8IZVvFltgZRYvF2L7LTcJG/xCU="
+        "rev": "d4547baf26dd70a18eeb38d231ce3f998004ec30",
+        "sha256": "9XU9TmBpuZeAOzqxuKVQZvdHRgX8fm4HcEfleM3jB7E="
     },
     "gw": {
         "owner": "libretro",
@@ -218,20 +218,20 @@
     "hatari": {
         "owner": "libretro",
         "repo": "hatari",
-        "rev": "79d128888ca3efdd27d639a35edf72a9bc81a798",
-        "sha256": "du2xORgAXTSQArqNuFa5gjticgZ+weqySFHVz2Y2qzI="
+        "rev": "e5e36a5262cfeadc3d1c7b411b7a70719c4f293c",
+        "sha256": "T4I3NVEMBKr5HLs60x48VNRl2TMnhqvaF+LTtYQ7qdU="
     },
     "mame": {
         "owner": "libretro",
         "repo": "mame",
-        "rev": "1f6e6075e9668f55d93c5ef4fa3b032c00c0b305",
-        "sha256": "9mnmnzqlE2ixeNSq8406N9xvUKWKVyRjfZ4atTKRt80="
+        "rev": "bd5f688bee8253f9222b13c4d33b6b8f6e442157",
+        "sha256": "23E/EjFXRxoSEG24AHjKW9H5hSjsPs3K/2uC7VJqXN0="
     },
     "mame2000": {
         "owner": "libretro",
         "repo": "mame2000-libretro",
-        "rev": "098df85e3bc04a74db8c810d51fb72879594dc40",
-        "sha256": "VvmDjgR3kgpfPBjo5wUPvxo4mYmpcdE2tlmRbwoGlQE="
+        "rev": "51079410d52da026e67448c482afeac7bcc876e7",
+        "sha256": "glMsTSu7YofKs0+cg1V6tHq1DWWuGl8vAGOUOSHkxFU="
     },
     "mame2003": {
         "owner": "libretro",
@@ -242,8 +242,8 @@
     "mame2003-plus": {
         "owner": "libretro",
         "repo": "mame2003-plus-libretro",
-        "rev": "6147fc1c8b759eb03110ddc71a21c2dbb3f5a685",
-        "sha256": "JAnOx4KOERdYFPga/jWR3Bx5x284JnVzfuspi9jDUEM="
+        "rev": "8f1498fff4f66323abc42b5e628f8760afe077ed",
+        "sha256": "a8EWUcp0fbOYryJ9lJFPK9rIOdcCyb1St71xVMuQBUY="
     },
     "mame2010": {
         "owner": "libretro",
@@ -272,14 +272,14 @@
     "mesen": {
         "owner": "libretro",
         "repo": "mesen",
-        "rev": "7376e98b8b3a6ef4c9e5c8dd34b65554d322019c",
-        "sha256": "9l8fek3Npm8adBQjkMFAnZs6IeLNjeeprbuXEcfRiHw="
+        "rev": "7dc6b816abca8663edc525a11c6115c394462c9c",
+        "sha256": "GPBMipEHDiqwH4KhuGl+Mzcy2IBcPbdmgH69etjXOk4="
     },
     "mesen-s": {
         "owner": "libretro",
         "repo": "mesen-s",
-        "rev": "42eb0e8ad346608dae86feb8a04833d16ad21541",
-        "sha256": "q6zeoNiZtFy8ZYls9/E+O7o9BYTcVcmYjbJA48qiraU="
+        "rev": "6e010d1676d9dd6c6bc2f3ddf6b301bb4c235a99",
+        "sha256": "z+O9wkqUPIjzE4fcHit5yUjoi5WFNUrgB0TS+nWy55o="
     },
     "meteor": {
         "owner": "libretro",
@@ -302,14 +302,14 @@
     "neocd": {
         "owner": "libretro",
         "repo": "neocd_libretro",
-        "rev": "3aa984f8d951ed43240a97233879b7063ea808e8",
-        "sha256": "+k0pOOZR8lbBEEQoqC5+TEG6HKNAK+DMTiOb9fwIBDw="
+        "rev": "327aeceecdf71c8a0c0af3d6dc53686c94fe44ad",
+        "sha256": "cY0P+0EQ0b9df+YT2EMvrxjp5L+DwIg31rEJqchU+hc="
     },
     "nestopia": {
         "owner": "libretro",
         "repo": "nestopia",
-        "rev": "a05e5bce06177c73de6bd233973ed718566e3f9a",
-        "sha256": "U7BkEZl8G/jtqvwCSRIWoqOz3ZyiGAOz65hfLoCoDeM="
+        "rev": "7dbd5c6384c4c6326004c97fd8e6fa07cb4edcef",
+        "sha256": "OBkWP36BzwsEW+ORF2opHlXwXHgGN0l2ZxBuyDO/sKY="
     },
     "np2kai": {
         "owner": "AZO234",
@@ -321,8 +321,8 @@
     "o2em": {
         "owner": "libretro",
         "repo": "libretro-o2em",
-        "rev": "f1050243e0d5285e7769e94a882b0cf39d2b7370",
-        "sha256": "wD+iJ8cKC8jYFZ6OVvX71uO7sSh5b/LLoc5+g7f3Yyg="
+        "rev": "efd749cec2dd1ce42a8aa3048a89f817d271d804",
+        "sha256": "aw0bJyQzYFOlQQOfNsRgqdeUJP1qF4llJxLq5t9oc5g="
     },
     "opera": {
         "owner": "libretro",
@@ -339,41 +339,41 @@
     "pcsx2": {
         "owner": "libretro",
         "repo": "pcsx2",
-        "rev": "7874ca39eb3fe11b3b967dc97e0d08f1bc945d22",
-        "sha256": "CCzIksku5RYXBiQUE2f3fkenvuDHAlwkVLjXd4dem+4="
+        "rev": "0251730a21d7238856d79aa25e2942b48edb38f6",
+        "sha256": "a/lWLBCww4QwxdO7Sbvmfq0XF9FnP4xzF51ljsWk46I="
     },
     "pcsx_rearmed": {
         "owner": "libretro",
         "repo": "pcsx_rearmed",
-        "rev": "40b19b536c6af2474d679d7ec1a529fcbe17a87c",
-        "sha256": "njOSlrXAPu4LlKKgJ4nBq9VCLnxTexU3SO7cBKtG4oA="
+        "rev": "861f92d714211167fb72583f921c992ada90f0fa",
+        "sha256": "474ZGrRBzu4mtr0QFTQIZp/b5fr0PjY4XERzBMpytTk="
     },
     "picodrive": {
         "owner": "libretro",
         "repo": "picodrive",
-        "rev": "6a0f515f95ea2080c8ac6b0bd2c194b48d991892",
-        "sha256": "d0n0Qj4/6MdM2Ekt9mlz9wTpVC+xjiQ4RAkmUmDeYyM=",
+        "rev": "788a4f955ae308e87705a71c0448ab53cc9c5416",
+        "sha256": "AT7mK0pTDWBSzw2JnK84Yf/4z5V4BYTcb082Pycy1Vk=",
         "fetchSubmodules": true
     },
     "play": {
         "owner": "jpd002",
         "repo": "Play-",
-        "rev": "26bdfebf5b7458fc05061f35233fe5e11f2a9297",
-        "sha256": "BSttx6nhCc0dyqq5b3WLewz8A8PgF2Xu4RM1YQEm4lI=",
+        "rev": "eb061f6be52e68ede8f8094372eda66f9b7b925f",
+        "sha256": "t6o/8xiRqG+1g8BQed0geDzlLTtFiGXg1ZuTuIanXak=",
         "fetchSubmodules": true
     },
     "ppsspp": {
         "owner": "hrydgard",
         "repo": "ppsspp",
-        "rev": "2abe3d615293bdee0cc32d6dd7719bc238e8c107",
-        "sha256": "uO6GVBIIPC0yFw0jjYFOu5y4SQ2zmw8LuKIhHebwvcs=",
+        "rev": "477b1773c2b43d1aeed8bf9c4e0b125326ae7b5a",
+        "sha256": "Xn/6sqV7iswUhHDaLLeugy2b7FtsqanlyY6UsTrKDFM=",
         "fetchSubmodules": true
     },
     "prboom": {
         "owner": "libretro",
         "repo": "libretro-prboom",
-        "rev": "4191903047650b40476f7f7584f4e2248789e4b7",
-        "sha256": "lQtIXsT7K9sPoeDobFFCKA0bj1WGmPezpcEfQCp6QEU="
+        "rev": "b22a6b19fd976a14374db9083baea9c91b079106",
+        "sha256": "NmEWRTHaZjV2Y6Wrc3WOamXCnOawKc2ja1KBDxokRiY="
     },
     "prosystem": {
         "owner": "libretro",
@@ -402,38 +402,38 @@
     "smsplus-gx": {
         "owner": "libretro",
         "repo": "smsplus-gx",
-        "rev": "ed5ec9e540934f8afb08b1c0aced226f8f797885",
-        "sha256": "GgrNBFjIdAg+IV/YNxB/CgvOxUo/J20j0rWfhP7fxak="
+        "rev": "8e8378896bc15c8a9f756339b596171ba266cc14",
+        "sha256": "zvG2SF4zx3Yaaf54NZ2DgsGPN59msW8TvQFCS4OMcHQ="
     },
     "snes9x": {
         "owner": "snes9xgit",
         "repo": "snes9x",
-        "rev": "0a94eaa6dc578a8d099f17af09cca9ce03de0877",
-        "sha256": "al8pKJxgOoL873Yfy9ony63x02ritTVUUp5C2qU67v0="
+        "rev": "78d006ffdbb5cb6944177db52c3640152948d928",
+        "sha256": "Qh+nLtwdLfjwYxXCv49pPPf0mqdxKRv/JLRm82knJu0="
     },
     "snes9x2002": {
         "owner": "libretro",
         "repo": "snes9x2002",
-        "rev": "ef4fa1dddd1c3ed6887d81898ac10c9e210ae84b",
-        "sha256": "gcVM1ip7PvOuEr/2kKWQ+ky1ErkJmENqteyysPX/P0I="
+        "rev": "25d9d4fea4c7d7fcc8608c65c2bec9bcbc41f26e",
+        "sha256": "EYcaWckvTfi2ajx6C1olE5pW51diLSjMdqZdyH8U2Ck="
     },
     "snes9x2005": {
         "owner": "libretro",
         "repo": "snes9x2005",
-        "rev": "abd072aa370620112a88cc7b350c2dfb1b58185a",
-        "sha256": "14XDe0D84xpI53o/HqxlhWUW0MW7sD5dGRZjXXtE2Ac="
+        "rev": "23f759bc4bf2e39733296f7749e446418e3cd0f3",
+        "sha256": "/bZrMp7NHgdYvA3Tw1ZoWXRg7VxmatRUX5cCJsU3NCY="
     },
     "snes9x2010": {
         "owner": "libretro",
         "repo": "snes9x2010",
-        "rev": "f422fcf58320e8cce5aad2abd227f2461251222a",
-        "sha256": "93/TT8tHsDntUoW4qCSAFlinUYUZasHb1vCGGkq+oJM="
+        "rev": "b12f3ba46f09dd5d0254676ed4b9e289d16b9ea8",
+        "sha256": "i4GEqZkgwlehuUQGcjLdMkO9xNWRs8k+3y2OGivwXCw="
     },
     "stella": {
         "owner": "stella-emu",
         "repo": "stella",
-        "rev": "279cffe7b74909ec936bb44a4c70e98d50cc8420",
-        "sha256": "jmtNEDZmw90eCfGBaAuxYz5zjgjQ0QYPdYWKXPIDOL0="
+        "rev": "fc1d87f6def11cec8773e89009ae8ed152d12487",
+        "sha256": "sja3OuTYq0BZwzuNFQ/pX6fCLaDWEbzTqlcQTxV87ZM="
     },
     "stella2014": {
         "owner": "libretro",
@@ -444,8 +444,8 @@
     "swanstation": {
         "owner": "libretro",
         "repo": "swanstation",
-        "rev": "74b958ceae11a1b72ba17d5b783b5eb1a6166701",
-        "sha256": "ge2jhOQmBs+MmWCcdfrn3gshS7ABAnLo5iyKi37wbRY="
+        "rev": "359086eed01e63816ad9daf826dc719da7b6e96a",
+        "sha256": "y4qQecbimsBShROeM9GzlGlKcr5TV5FxOb5pzmQf4LE="
     },
     "tgbdual": {
         "owner": "libretro",
@@ -462,8 +462,8 @@
     "tic80": {
         "owner": "libretro",
         "repo": "tic-80",
-        "rev": "510fcacef43b662b9fc4586528482048eaeb7fb4",
-        "sha256": "BYwrdeaUHoX60alH2i1CgyWsHE5qopUTB1pw1n6FN+w=",
+        "rev": "e9f62f85a154796c6baaee8a9f6fd0cfdd447019",
+        "sha256": "JTAoIqxqpaLjsQiIpJ4wQsREI5/rTxVxDywoL3oLI4Q=",
         "fetchSubmodules": true
     },
     "vba-m": {
@@ -475,14 +475,14 @@
     "vba-next": {
         "owner": "libretro",
         "repo": "vba-next",
-        "rev": "b218f48bb27b5d3885fa4076ff325922b5acd817",
-        "sha256": "idqGMbMA9mZlIh0QAba3BxpPDi/bFJJkUbnxV3xMOCo="
+        "rev": "ebd175d57ebb2065726099d32034cb25934787ce",
+        "sha256": "hTUlhLzvsemNz6wSmlnQNoNtzaVhipA+hmVmhzZVN+w="
     },
     "vecx": {
         "owner": "libretro",
         "repo": "libretro-vecx",
-        "rev": "28d6efc8972313903d0802a736ff8c3bc115e78f",
-        "sha256": "VYa8s+HB8IYF+HS6SA+sO5DzpgCtnMGrh88KTVNGICY="
+        "rev": "141af284202c86ed0d4ce9030c76954a144287cf",
+        "sha256": "p5vMuG2vr3BTJOQWNcTPb89MlkVrRvJNTIJSU8r9zfU="
     },
     "virtualjaguar": {
         "owner": "libretro",

From 7c4c28b2ca7685a369813dc3bed644ea4c1ceb50 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 17:27:42 +0100
Subject: [PATCH 06/10] libretro.citra-canary: remove it

Not maintained anymore by upstream.
---
 .../applications/emulators/retroarch/cores.nix | 18 ------------------
 .../emulators/retroarch/hashes.json            |  9 ---------
 .../applications/emulators/retroarch/update.py |  7 -------
 3 files changed, 34 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index ddf81d9066c5..830e16e488c6 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -313,24 +313,6 @@ in
     postBuild = "cd src/citra_libretro";
   };
 
-  citra-canary = mkLibRetroCore {
-    core = "citra-canary";
-    description = "Port of Citra Canary/Experimental to libretro";
-    license = lib.licenses.gpl2Plus;
-    extraNativeBuildInputs = [ cmake pkg-config ];
-    extraBuildInputs = [ libGLU libGL boost ];
-    makefile = "Makefile";
-    cmakeFlags = [
-      "-DENABLE_LIBRETRO=ON"
-      "-DENABLE_QT=OFF"
-      "-DENABLE_SDL2=OFF"
-      "-DENABLE_WEB_SERVICE=OFF"
-      "-DENABLE_DISCORD_PRESENCE=OFF"
-    ];
-    preConfigure = "sed -e '77d' -i externals/cmake-modules/GetGitRevisionDescription.cmake";
-    postBuild = "cd src/citra_libretro";
-  };
-
   desmume = mkLibRetroCore {
     core = "desmume";
     description = "libretro wrapper for desmume NDS emulator";
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 7e5ecbe1a230..b7fc01bfb4f5 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -110,15 +110,6 @@
         "leaveDotGit": true,
         "deepClone": true
     },
-    "citra-canary": {
-        "owner": "libretro",
-        "repo": "citra",
-        "rev": "5401990a9be46e4497abc92db3d5f2042674303d",
-        "sha256": "JKKJBa840i7ESwMrB5tKamCBmrYvvoEUdibqxkWg5Gc=",
-        "fetchSubmodules": true,
-        "leaveDotGit": true,
-        "deepClone": true
-    },
     "desmume": {
         "owner": "libretro",
         "repo": "desmume",
diff --git a/pkgs/applications/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py
index 68f72103168e..7d858a1dfa57 100755
--- a/pkgs/applications/emulators/retroarch/update.py
+++ b/pkgs/applications/emulators/retroarch/update.py
@@ -32,13 +32,6 @@ CORES = {
         "deep_clone": True,
         "leave_dot_git": True,
     },
-    "citra-canary": {
-        "repo": "citra",
-        "fetch_submodules": True,
-        "deep_clone": True,
-        "leave_dot_git": True,
-        "rev": "canary",
-    },
     "desmume": {"repo": "desmume"},
     "desmume2015": {"repo": "desmume2015"},
     "dolphin": {"repo": "dolphin"},

From e6acb0c6a8b18bbb598616cc5845be735ae4e31b Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 18:10:28 +0100
Subject: [PATCH 07/10] libretro.citra: fix build

---
 .../emulators/retroarch/cores.nix             | 34 ++++++++-----------
 .../emulators/retroarch/hashes.json           |  5 ++-
 .../emulators/retroarch/update.py             |  2 +-
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 830e16e488c6..311f365af9e3 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -1,23 +1,22 @@
 { lib
 , stdenv
-, SDL
 , alsa-lib
 , boost
-, buildPackages
 , bzip2
 , cmake
 , curl
 , fetchFromGitHub
 , ffmpeg
 , fluidsynth
+, gcc10Stdenv
 , gettext
 , hexdump
 , hidapi
 , icu
 , libaio
+, libevdev
 , libGL
 , libGLU
-, libevdev
 , libjpeg
 , libpcap
 , libpng
@@ -32,6 +31,7 @@
 , portaudio
 , python3
 , retroarch
+, SDL
 , sfml
 , snappy
 , udev
@@ -53,6 +53,7 @@ let
     , description
       # Check https://github.com/libretro/libretro-core-info for license information
     , license
+    , stdenvOverride ? stdenv
     , src ? (getCoreSrc core)
     , broken ? false
     , version ? "unstable-2022-04-05"
@@ -62,8 +63,9 @@ let
     , normalizeCore ? true
     , ...
     }@args:
-    stdenv.mkDerivation (
+    stdenvOverride.mkDerivation (
       let
+        inherit (stdenvOverride) hostPlatform;
         d2u = if normalizeCore then (lib.replaceChars [ "-" ] [ "_" ]) else (x: x);
       in
       (rec {
@@ -79,12 +81,12 @@ let
             linux = "unix";
             darwin = "osx";
             windows = "win";
-          }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}"
+          }.${hostPlatform.parsed.kernel.name} or hostPlatform.parsed.kernel.name}"
           "ARCH=${{
             armv7l = "arm";
             armv6l = "arm";
             i686 = "x86";
-          }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}"
+          }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name}"
         ] ++ (args.makeFlags or [ ]);
 
         coreDir = "${placeholder "out"}/lib/retroarch/cores";
@@ -94,9 +96,9 @@ let
 
           mkdir -p $out/bin
           mkdir -p $coreDir
-          mv ${d2u args.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $coreDir
+          mv ${d2u args.core}_libretro${hostPlatform.extensions.sharedLibrary} $coreDir
           makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \
-            --add-flags "-L $coreDir/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@"
+            --add-flags "-L $coreDir/${d2u core}_libretro${hostPlatform.extensions.sharedLibrary} $@"
 
           runHook postInstall
         '';
@@ -298,19 +300,11 @@ in
   citra = mkLibRetroCore {
     core = "citra";
     description = "Port of Citra to libretro";
+    stdenvOverride = gcc10Stdenv;
     license = lib.licenses.gpl2Plus;
-    extraNativeBuildInputs = [ cmake pkg-config ];
-    extraBuildInputs = [ libGLU libGL boost ];
+    extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ];
     makefile = "Makefile";
-    cmakeFlags = [
-      "-DENABLE_LIBRETRO=ON"
-      "-DENABLE_QT=OFF"
-      "-DENABLE_SDL2=OFF"
-      "-DENABLE_WEB_SERVICE=OFF"
-      "-DENABLE_DISCORD_PRESENCE=OFF"
-    ];
-    preConfigure = "sed -e '77d' -i externals/cmake-modules/GetGitRevisionDescription.cmake";
-    postBuild = "cd src/citra_libretro";
+    makeFlags = [ "HAVE_FFMPEG_STATIC=0" ];
   };
 
   desmume = mkLibRetroCore {
@@ -462,7 +456,7 @@ in
     dontUseCmakeConfigure = true;
     dontConfigure = true;
     makeFlags = [ "EXTERNAL_ZLIB=1" ];
-    depsBuildBuild = [ buildPackages.stdenv.cc ];
+    depsBuildBuild = [ stdenv.cc ];
   };
 
   mame = mkLibRetroCore {
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index b7fc01bfb4f5..0f660b50b857 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -105,10 +105,9 @@
         "owner": "libretro",
         "repo": "citra",
         "rev": "44e01f99016008eff18bc7a28234d1098382358d",
-        "sha256": "iUp8O0hGCyrbVGoKb95Z3MuFlEzjvaLhgWxo8hAOLIk=",
+        "sha256": "Vj0d2wAC9UYWgSURL1Qv0LR11g7c789U3W4MV3phv+4=",
         "fetchSubmodules": true,
-        "leaveDotGit": true,
-        "deepClone": true
+        "leaveDotGit": true
     },
     "desmume": {
         "owner": "libretro",
diff --git a/pkgs/applications/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py
index 7d858a1dfa57..c75b5af622b5 100755
--- a/pkgs/applications/emulators/retroarch/update.py
+++ b/pkgs/applications/emulators/retroarch/update.py
@@ -29,7 +29,7 @@ CORES = {
     "citra": {
         "repo": "citra",
         "fetch_submodules": True,
-        "deep_clone": True,
+        "deep_clone": False,
         "leave_dot_git": True,
     },
     "desmume": {"repo": "desmume"},

From 13188121a48fd453dc45f31fee649a7a57e1117f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 18:10:51 +0100
Subject: [PATCH 08/10] libretro.hatari: simplify build

---
 pkgs/applications/emulators/retroarch/cores.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 311f365af9e3..76d4f04ecba2 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -452,11 +452,9 @@ in
     description = "Port of Hatari to libretro";
     license = lib.licenses.gpl2Only;
     extraBuildInputs = [ SDL zlib ];
-    extraNativeBuildInputs = [ cmake which ];
-    dontUseCmakeConfigure = true;
+    extraNativeBuildInputs = [ which ];
     dontConfigure = true;
     makeFlags = [ "EXTERNAL_ZLIB=1" ];
-    depsBuildBuild = [ stdenv.cc ];
   };
 
   mame = mkLibRetroCore {
@@ -464,7 +462,6 @@ in
     description = "Port of MAME to libretro";
     license = with lib.licenses; [ bsd3 gpl2Plus ];
     extraBuildInputs = [ alsa-lib libGLU libGL portaudio python3 xorg.libX11 ];
-    makefile = "Makefile.libretro";
   };
 
   mame2000 = mkLibRetroCore {
@@ -595,7 +592,6 @@ in
     src = getCoreSrc core;
     description = "Neko Project II kai libretro port";
     license = lib.licenses.mit;
-    makefile = "Makefile.libretro";
     makeFlags = [
       # See https://github.com/AZO234/NP2kai/tags
       "NP2KAI_VERSION=rev.22"

From 3c1b148066610e9afc864bcea8fad4942ca14873 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 21:00:19 +0100
Subject: [PATCH 09/10] libretro: unstable-2022-04-05 -> unstable-2022-04-08

---
 .../emulators/retroarch/cores.nix             |   2 +-
 .../emulators/retroarch/hashes.json           | 105 +++++++++---------
 .../emulators/retroarch/update.py             |   7 +-
 3 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 76d4f04ecba2..64de314c760f 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -56,7 +56,7 @@ let
     , stdenvOverride ? stdenv
     , src ? (getCoreSrc core)
     , broken ? false
-    , version ? "unstable-2022-04-05"
+    , version ? "unstable-2022-04-08"
     , platforms ? retroarch.meta.platforms
       # The resulting core file is based on core name
       # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 0f660b50b857..78969df95d30 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -50,8 +50,8 @@
     "beetle-snes": {
         "owner": "libretro",
         "repo": "beetle-bsnes-libretro",
-        "rev": "bc867656d7438aaffc6818b3b92350587bc78a47",
-        "sha256": "TyUCRGK+uyXowDjXW9/4m+zL8Vh/3GGsX1eznrTCbAg="
+        "rev": "d770563fc3c4bd9abb522952cefb4aa923ba0b91",
+        "sha256": "zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0="
     },
     "beetle-supergrafx": {
         "owner": "libretro",
@@ -68,8 +68,8 @@
     "beetle-wswan": {
         "owner": "libretro",
         "repo": "beetle-wswan-libretro",
-        "rev": "8f9fc6bd7afa7f7741ccba63fc27192d522de4b9",
-        "sha256": "DVuuILS4m0cMDjKQ99VU2HG60y4tFhGKwgDCrFNLp6E="
+        "rev": "089a62477c5f51ac746a5fc8eacf3599e9feb649",
+        "sha256": "yaaEJ+XgrBgtTEkffgnxvt2mrp5dsDYJ+TTxCZZU5OE="
     },
     "blastem": {
         "owner": "libretro",
@@ -98,40 +98,39 @@
     "bsnes-mercury": {
         "owner": "libretro",
         "repo": "bsnes-mercury",
-        "rev": "60431e0507c3492c4d6e4f950c4e551fe4e7e57d",
-        "sha256": "EAvBEFY0I4960DohDOShgu0Jfnww9B6bf6wPxVi7Ogg="
+        "rev": "4ba6d8d88e57d3193d95e1bcf39e8d31121f76d4",
+        "sha256": "w2MVslgRlxW4SMzgcXP4gXr9A8B07N7LNrB1LXzk1Zk="
     },
     "citra": {
         "owner": "libretro",
         "repo": "citra",
         "rev": "44e01f99016008eff18bc7a28234d1098382358d",
-        "sha256": "Vj0d2wAC9UYWgSURL1Qv0LR11g7c789U3W4MV3phv+4=",
-        "fetchSubmodules": true,
-        "leaveDotGit": true
+        "sha256": "vIrUStv+VM8pYeznnWSVBRfSA71/B7VIY7B/syymGzE=",
+        "fetchSubmodules": true
     },
     "desmume": {
         "owner": "libretro",
         "repo": "desmume",
-        "rev": "7b16293ebb8e272ce28d62efc39573b129cea61d",
-        "sha256": "WTUA0iOG5E8OuHjd+qbd4C5BoaN4WFYetPGj9r7CDpI="
+        "rev": "5d0ae2be2c9fb6362af528b3722e81323318eb9f",
+        "sha256": "4bJ6fLZ+fV7SnZ71YT3JFcXFOgmskNUCmCHwc2QNl0A="
     },
     "desmume2015": {
         "owner": "libretro",
         "repo": "desmume2015",
-        "rev": "cd89fb7c48c735cb321311fbce7e6e9889dda1ce",
-        "sha256": "9Ou/n6pxRjJOp/Ybpyg4+Simosj2X26kLZCMEqeVL6U="
+        "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893",
+        "sha256": "kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U="
     },
     "dolphin": {
         "owner": "libretro",
         "repo": "dolphin",
-        "rev": "61475de768fb7457128853656e53a942aedd79fe",
-        "sha256": "pInezsAtzVanlGHCQKraaqzWXWDYf/v5YYE7BS5yOAk="
+        "rev": "6a0b6ee8a4d5363e669f5faf43abc8f17e4278a8",
+        "sha256": "TeeHnttGmCeOTDTK/gJM+RpusjDDndapZAa3T+oLiq0="
     },
     "dosbox": {
         "owner": "libretro",
         "repo": "dosbox-libretro",
-        "rev": "1aff406faed3cfde5c1b658bacd9f8f639915912",
-        "sha256": "qRUXYd4oWRUFGAezs9Un+Avpx5Rwu1Ngjc80R5gise0="
+        "rev": "74cd17ed0ff810ff78cb8c1f1e45513bfe8a0f32",
+        "sha256": "0PIloW7j/87asDJ8IDw4r3r4muxNF+RbvkIRPLZQvRc="
     },
     "eightyone": {
         "owner": "libretro",
@@ -148,20 +147,20 @@
     "fbneo": {
         "owner": "libretro",
         "repo": "fbneo",
-        "rev": "5ad211ca3d0cfc1945fee6dc260885f2ee661d79",
-        "sha256": "SHURJYmSR42uQyyqYGd071fRci9DZJ6KaD0ZWi3y/S4="
+        "rev": "01bf2e189dcd96f978c3a4ae7bbbb00f2d90aabf",
+        "sha256": "naCfGSrwA9vO3Cu2rHLplCMcTbpx6S/sapwisFCcL5c="
     },
     "fceumm": {
         "owner": "libretro",
         "repo": "libretro-fceumm",
-        "rev": "013c6f3b563261747dac316c2ece81a27f963c21",
-        "sha256": "OCtiMkiWvWZYyv+E5KSf06fIrcO9+ZjsUGOVVFWc/c8="
+        "rev": "b3c35b6515b2b6a789c589f976a4a323ebebe3eb",
+        "sha256": "zwFQGQyO0Vj/IBM1k8JB3D/jB3OwDuGdSHLavr8Fxgw="
     },
     "flycast": {
         "owner": "libretro",
         "repo": "flycast",
-        "rev": "886188804de48a4bd9324046598e8dedfd0d2099",
-        "sha256": "Wxn1zEQElwLRSND4iLcIdSmiurj0WRdDgf5BfpomD9o="
+        "rev": "4c293f306bc16a265c2d768af5d0cea138426054",
+        "sha256": "9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo="
     },
     "fmsx": {
         "owner": "libretro",
@@ -196,8 +195,8 @@
     "gw": {
         "owner": "libretro",
         "repo": "gw-libretro",
-        "rev": "fc3d8d355b45466c52f8c56a8bcd395b702b310b",
-        "sha256": "kl7+StKOW7Yri7Q4O5BaxwVBIev9NLGWh0NYvyXZF20="
+        "rev": "85bf5c936044db0bf4138e7eb8ab20d3a7330035",
+        "sha256": "yCAnveQw+VyZFQ/GsUBuyoMRQ4yfhA0f3tYghZ2HecU="
     },
     "handy": {
         "owner": "libretro",
@@ -214,14 +213,14 @@
     "mame": {
         "owner": "libretro",
         "repo": "mame",
-        "rev": "bd5f688bee8253f9222b13c4d33b6b8f6e442157",
-        "sha256": "23E/EjFXRxoSEG24AHjKW9H5hSjsPs3K/2uC7VJqXN0="
+        "rev": "2a0e4ea0e2362bb7dcf77216c9fcb48426cea1e8",
+        "sha256": "imuHEwzDpI8jbdOeOhBBfzl4k74mDq/3SrKD8upzZmo="
     },
     "mame2000": {
         "owner": "libretro",
         "repo": "mame2000-libretro",
-        "rev": "51079410d52da026e67448c482afeac7bcc876e7",
-        "sha256": "glMsTSu7YofKs0+cg1V6tHq1DWWuGl8vAGOUOSHkxFU="
+        "rev": "f35db3877f8a79a174dd3b2e37f4ebf39d71d5a4",
+        "sha256": "JmtvxKWAYNk1SyV1YpFeLX49zzGqpUv6nqM82xU70OM="
     },
     "mame2003": {
         "owner": "libretro",
@@ -232,8 +231,8 @@
     "mame2003-plus": {
         "owner": "libretro",
         "repo": "mame2003-plus-libretro",
-        "rev": "8f1498fff4f66323abc42b5e628f8760afe077ed",
-        "sha256": "a8EWUcp0fbOYryJ9lJFPK9rIOdcCyb1St71xVMuQBUY="
+        "rev": "e5ee29ecb8182952f861f22516e5791625fe2671",
+        "sha256": "YunfAITR/Etm8lvEab/HigZoBz+ayJQ7ezjItWI/HvE="
     },
     "mame2010": {
         "owner": "libretro",
@@ -250,8 +249,8 @@
     "mame2016": {
         "owner": "libretro",
         "repo": "mame2016-libretro",
-        "rev": "bcff8046328da388d100b1634718515e1b15415d",
-        "sha256": "XxnX39+0VUbG9TF8+wFEFVxHCm2rzrJsIQryyNsF6zU="
+        "rev": "01058613a0109424c4e7211e49ed83ac950d3993",
+        "sha256": "IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak="
     },
     "melonds": {
         "owner": "libretro",
@@ -262,14 +261,14 @@
     "mesen": {
         "owner": "libretro",
         "repo": "mesen",
-        "rev": "7dc6b816abca8663edc525a11c6115c394462c9c",
-        "sha256": "GPBMipEHDiqwH4KhuGl+Mzcy2IBcPbdmgH69etjXOk4="
+        "rev": "bb9ea02eba28682986044a6f49329ec533aa26ba",
+        "sha256": "G2NQDpByvI9RFEwrRiKXcMnPtVtqpvEoZgk7/fk5qCU="
     },
     "mesen-s": {
         "owner": "libretro",
         "repo": "mesen-s",
-        "rev": "6e010d1676d9dd6c6bc2f3ddf6b301bb4c235a99",
-        "sha256": "z+O9wkqUPIjzE4fcHit5yUjoi5WFNUrgB0TS+nWy55o="
+        "rev": "3694c7f9692a0be32d86979c347884ae9def0a3b",
+        "sha256": "VBNl4682e2X12WNjtXZ3P4/Kw4OeRLSRWyZqYDpfmCo="
     },
     "meteor": {
         "owner": "libretro",
@@ -323,8 +322,8 @@
     "parallel-n64": {
         "owner": "libretro",
         "repo": "parallel-n64",
-        "rev": "28c4572c9a09447b3bf5ed5fbd3594a558bc210d",
-        "sha256": "by8NvKjVT9OrgVhNtv5E4Fqmdva42lWV8UQi0SKfBL8="
+        "rev": "b804ab1a199d6ff1f8fef4aa7dfcf663990e430b",
+        "sha256": "zAet6hYa/79CBbvwZNTNs/ayWuHHlwg+0Y4BAUFddBc="
     },
     "pcsx2": {
         "owner": "libretro",
@@ -335,28 +334,28 @@
     "pcsx_rearmed": {
         "owner": "libretro",
         "repo": "pcsx_rearmed",
-        "rev": "861f92d714211167fb72583f921c992ada90f0fa",
-        "sha256": "474ZGrRBzu4mtr0QFTQIZp/b5fr0PjY4XERzBMpytTk="
+        "rev": "37d9bf8315be570a350cd44876ae14f9b0eff20b",
+        "sha256": "ieuEWs+NIQFCgMl/yTnaFdClxEv5NurrLuUvkjSUar0="
     },
     "picodrive": {
         "owner": "libretro",
         "repo": "picodrive",
-        "rev": "788a4f955ae308e87705a71c0448ab53cc9c5416",
-        "sha256": "AT7mK0pTDWBSzw2JnK84Yf/4z5V4BYTcb082Pycy1Vk=",
+        "rev": "bb6a52fe60e6f3bdcd17effe75e68fd0f8c44ba7",
+        "sha256": "wztctLbK7VE4OPJS7ixKwnN4VkQv96Te3FmJlZ5m4A0=",
         "fetchSubmodules": true
     },
     "play": {
         "owner": "jpd002",
         "repo": "Play-",
-        "rev": "eb061f6be52e68ede8f8094372eda66f9b7b925f",
-        "sha256": "t6o/8xiRqG+1g8BQed0geDzlLTtFiGXg1ZuTuIanXak=",
+        "rev": "ec2a9460ea2beeb69d30534ee8affbda4fc4b156",
+        "sha256": "8maLaSJiF9soJdIlYoFHSG+2XXYTdLmWH6cq9vZRd/4=",
         "fetchSubmodules": true
     },
     "ppsspp": {
         "owner": "hrydgard",
         "repo": "ppsspp",
-        "rev": "477b1773c2b43d1aeed8bf9c4e0b125326ae7b5a",
-        "sha256": "Xn/6sqV7iswUhHDaLLeugy2b7FtsqanlyY6UsTrKDFM=",
+        "rev": "0eea0acf13022ff8d910adb55cec14ebad825afc",
+        "sha256": "f1Tscndz0TcW0bUhixEvsrbFKefLfsCFjqWA7ANnfB4=",
         "fetchSubmodules": true
     },
     "prboom": {
@@ -386,8 +385,8 @@
     "scummvm": {
         "owner": "libretro",
         "repo": "scummvm",
-        "rev": "80cb7269a33b233dcea27d8d01df084b0d35c80a",
-        "sha256": "5kMWM8d5aBbT7TseNyaYxw7VDkrLL0G+KUvJcUboQgA="
+        "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3",
+        "sha256": "wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="
     },
     "smsplus-gx": {
         "owner": "libretro",
@@ -422,8 +421,8 @@
     "stella": {
         "owner": "stella-emu",
         "repo": "stella",
-        "rev": "fc1d87f6def11cec8773e89009ae8ed152d12487",
-        "sha256": "sja3OuTYq0BZwzuNFQ/pX6fCLaDWEbzTqlcQTxV87ZM="
+        "rev": "071e8f7eb1096dfe95d9eb2e5b7b27b30f28fbf9",
+        "sha256": "8WzBL8ojsHYxOqItHeeG4djALhqBBOV7nHE078UzqAY="
     },
     "stella2014": {
         "owner": "libretro",
@@ -434,8 +433,8 @@
     "swanstation": {
         "owner": "libretro",
         "repo": "swanstation",
-        "rev": "359086eed01e63816ad9daf826dc719da7b6e96a",
-        "sha256": "y4qQecbimsBShROeM9GzlGlKcr5TV5FxOb5pzmQf4LE="
+        "rev": "0932243b0e5f1a5a237b0521b30b39473b61fa31",
+        "sha256": "krA7X9CIOg53giWSMXgzgazeyWFXEpMobPSnOB7g994="
     },
     "tgbdual": {
         "owner": "libretro",
diff --git a/pkgs/applications/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py
index c75b5af622b5..0facf4e2656e 100755
--- a/pkgs/applications/emulators/retroarch/update.py
+++ b/pkgs/applications/emulators/retroarch/update.py
@@ -26,12 +26,7 @@ CORES = {
     "bsnes": {"repo": "bsnes-libretro"},
     "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"},
     "bsnes-mercury": {"repo": "bsnes-mercury"},
-    "citra": {
-        "repo": "citra",
-        "fetch_submodules": True,
-        "deep_clone": False,
-        "leave_dot_git": True,
-    },
+    "citra": { "repo": "citra", "fetch_submodules": True },
     "desmume": {"repo": "desmume"},
     "desmume2015": {"repo": "desmume2015"},
     "dolphin": {"repo": "dolphin"},

From eab6133b18ac806a5ca0894c0728d34b5fa935a3 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 8 Apr 2022 23:22:01 +0100
Subject: [PATCH 10/10] libretro: rename script

---
 .../emulators/retroarch/{update.py => update_cores.py}            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/applications/emulators/retroarch/{update.py => update_cores.py} (100%)

diff --git a/pkgs/applications/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update_cores.py
similarity index 100%
rename from pkgs/applications/emulators/retroarch/update.py
rename to pkgs/applications/emulators/retroarch/update_cores.py