Skip to content

Commit ab95e6c

Browse files
committed
Retroarch libretro-core-info
1 parent 834f5f9 commit ab95e6c

File tree

4 files changed

+68
-6
lines changed

4 files changed

+68
-6
lines changed

flake.nix

+2-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
};
1818

1919
nixinate = {
20-
# url = "github:MatthewCroughan/nixinate";
2120
url = "github:J-Swift/nixinate/fix/macos-shm";
2221
inputs.nixpkgs.follows = "nixpkgs";
2322
};
@@ -37,7 +36,6 @@
3736
{
3837
apps = nixinate.nixinate.${eachSystem} self;
3938
devShell = import ./shell.nix { inherit pkgs; };
40-
# packages.batocera = pkgs.callPackage ./packages/batocera { inherit batocera-src; };
4139
}
4240
) //
4341
{
@@ -83,8 +81,6 @@
8381
batocera-resolution = pkgs.callPackage ./packages/batocera/core/batocera-resolution { inherit batocera-src; };
8482

8583
emulationstation-batocera = pkgs.callPackage ./overlays/emulationstation-batocera { };
86-
87-
batocera-shaders = pkgs.callPackage ./profiles/systems/retroarch/shaders/batocera-shaders { inherit batocera-src; };
8884
})
8985
];
9086
};
@@ -293,13 +289,14 @@
293289
pkgs.batocera-resolution
294290

295291
pkgs.emulationstation-batocera
296-
pkgs.batocera-shaders
297292
];
298293

299294
bato.systems.psx.enable = true;
300295
bato.systems.snes.enable = true;
301296
}
302297
];
298+
299+
specialArgs = { inherit batocera-src; };
303300
};
304301
};
305302
};

packages/batocera/core/batocera-resolution/default.nix

+8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
, stdenv
33
, batocera-src
44

5+
, makeWrapper
56
, pciutils
7+
, ffmpeg
68

79
, script-type ? "xorg"
810
}:
@@ -16,6 +18,10 @@ stdenv.mkDerivation (finalAttrs: {
1618

1719
dontBuild = true;
1820

21+
nativeBuildInputs = [
22+
makeWrapper
23+
];
24+
1925
buildInputs = [
2026
pciutils
2127
];
@@ -29,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
2935
mkdir -p $out/bin
3036
install -m 0755 $batoPath/resolution/batocera-resolution.${script-type} $out/bin/batocera-resolution
3137
install -m 0755 $batoPath/screenshot/batocera-screenshot.${script-type} $out/bin/batocera-screenshot
38+
wrapProgram $out/bin/batocera-screenshot \
39+
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
3240
3341
mkdir -p $out/etc/X11/xorg.conf.d
3442
cp -prn $currentSrc/board/batocera/x86/fsoverlay/etc/X11/xorg.conf.d/20-amdgpu.conf $out/etc/X11/xorg.conf.d/20-amdgpu.conf

profiles/systems/retroarch/default.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ config, pkgs, lib, ... }:
1+
{ config, pkgs, lib, batocera-src, ... }:
22

33
let
44
cfg = config.bato.systems.retroarch;
@@ -29,6 +29,8 @@ in
2929
in
3030
[
3131
retro-with-cores
32+
(pkgs.callPackage ./shaders/batocera-shaders { inherit batocera-src; })
33+
(pkgs.callPackage ./libretro-core-info { })
3234
];
3335
};
3436
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{ lib
2+
, stdenv
3+
, fetchFromGitHub
4+
}:
5+
6+
stdenv.mkDerivation (finalAttrs: {
7+
pname = "libretro-core-info";
8+
9+
# NOTE: this is mirroring batocera v39 snapshot
10+
version = "v1.16.0";
11+
src = fetchFromGitHub {
12+
owner = "libretro";
13+
repo = "libretro-core-info";
14+
rev = finalAttrs.version;
15+
hash = "sha256-LK+iBKi5Rq/8zpOzwqql8xEUj84+mH6o5KbNCMH7sMA=";
16+
};
17+
18+
dontBuild = true;
19+
20+
makeFlags = [ "PREFIX=$(out)" ];
21+
22+
postInstall = ''
23+
currentSrc=$(pwd)
24+
25+
mkdir -p $out/share/libretro/info
26+
27+
cd $out/share/libretro/info
28+
ln -sf mednafen_saturn_libretro.info beetle-saturn_libretro.info
29+
ln -sf bsnes_hd_beta_libretro.info bsnes_hd_libretro.info
30+
ln -sf genesis_plus_gx_wide_libretro.info genesisplusgx-wide_libretro.info
31+
ln -sf genesis_plus_gx_libretro.info genesisplusgx_libretro.info
32+
ln -sf mame2010_libretro.info mame0139_libretro.info
33+
ln -sf mame2003_plus_libretro.info mame078plus_libretro.info
34+
ln -sf mame_libretro.info mess_libretro.info
35+
ln -sf mupen64plus_next_libretro.info mupen64plus-next_libretro.info
36+
ln -sf mednafen_pce_fast_libretro.info pce_fast_libretro.info
37+
ln -sf mednafen_pce_libretro.info pce_libretro.info
38+
ln -sf mednafen_pcfx_libretro.info pcfx_libretro.info
39+
ln -sf snes9x2002_libretro.info pocketsnes_libretro.info
40+
ln -sf snes9x2010_libretro.info snes9x_next_libretro.info
41+
ln -sf vbam_libretro.info vba-m_libretro.info
42+
ln -sf mednafen_vb_libretro.info vb_libretro.info
43+
44+
# emuscv_libretro.info => no info found
45+
# mamevirtual_libretro.so => no info found
46+
# superflappybirds_libretro.so => no info found
47+
# zc210_libretro.so => no info found
48+
# hatarib_libretro.info => no info found
49+
touch $out/share/libretro/info/emuscv_libretro.info
50+
touch $out/share/libretro/info/mamevirtual_libretro.info
51+
touch $out/share/libretro/info/superflappybirds_libretro.info
52+
touch $out/share/libretro/info/zc210_libretro.info
53+
touch $out/share/libretro/info/hatarib_libretro.info
54+
'';
55+
})

0 commit comments

Comments
 (0)