From 0d9f8458a604cb6b94d702e70c941c9bd7c67420 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 22 Nov 2021 00:27:10 -0300 Subject: [PATCH] retroarch: switch from libretro-super to libretro-core-info --- pkgs/misc/emulators/retroarch/cores.nix | 2 +- pkgs/misc/emulators/retroarch/default.nix | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index f142baf59389..fb7ec0745343 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -50,7 +50,7 @@ let mkLibRetroCore = { core , description - # Check https://github.com/libretro/libretro-super for license information + # Check https://github.com/libretro/libretro-core-info for license information , license , src ? null , broken ? false diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index b2621ba8cc13..5a294277c80c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -36,16 +36,18 @@ with lib; let + mainVersion = "1.9.13"; + revision = "2"; libretroSuperSrc = fetchFromGitHub { owner = "libretro"; - repo = "libretro-super"; - sha256 = "sha256-4WB6/1DDec+smhMJKLCxWb4+LQlZN8v2ik69saKixkE="; - rev = "fa70d9843838df719623094965bd447e4db0d1b4"; + repo = "libretro-core-info"; + sha256 = "sha256-jM+iXNSCpJy4wOk1S72G1UjNGBzejyhs5LFFWCFjs2c="; + rev = "v${mainVersion}"; }; in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.9.13.2"; + version = "${lib.concatStringsSep "." [ mainVersion revision ]}"; src = fetchFromGitHub { owner = "libretro"; @@ -98,7 +100,7 @@ stdenv.mkDerivation rec { postInstall = optionalString withVulkan '' mkdir -p $out/share/libretro/info # TODO: ideally each core should have its own core information - cp -r ${libretroSuperSrc}/dist/info/* $out/share/libretro/info + cp -r ${libretroSuperSrc}/* $out/share/libretro/info wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib '';