fix retroarch wrapping
This commit is contained in:
parent
c6e27fd9d2
commit
33970a47dc
1 changed files with 3 additions and 4 deletions
|
@ -12,7 +12,7 @@ let
|
||||||
settings' = { libretro_directory = coresPath; } // settings;
|
settings' = { libretro_directory = coresPath; } // settings;
|
||||||
settingsPath = runCommand "declarative-retroarch.cfg"
|
settingsPath = runCommand "declarative-retroarch.cfg"
|
||||||
{
|
{
|
||||||
value = lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "${n} = \"${v}\"") settings);
|
value = lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "${n} = \"${v}\"") settings');
|
||||||
passAsFile = [ "value" ];
|
passAsFile = [ "value" ];
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
|
@ -20,8 +20,8 @@ let
|
||||||
'';
|
'';
|
||||||
coresPath = let
|
coresPath = let
|
||||||
path = assert
|
path = assert
|
||||||
lib.assertMsg (builtins.length (map (c: c.libretroCore) cores) == 1)
|
lib.assertMsg (builtins.length (lib.unique (map (c: c.libretroCore) cores)) == 1)
|
||||||
"Libretro cores are not under the same paths";
|
"Libretro cores are not under the same paths: ${builtins.toString (lib.unique (builtins.map (c: c.libretroCore) cores))}";
|
||||||
(builtins.head cores).libretroCore;
|
(builtins.head cores).libretroCore;
|
||||||
in
|
in
|
||||||
symlinkJoin {
|
symlinkJoin {
|
||||||
|
@ -43,7 +43,6 @@ symlinkJoin {
|
||||||
};
|
};
|
||||||
|
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
# wrap binary to load cores from the proper location(s)
|
|
||||||
wrapProgram $out/bin/retroarch ${wrapperArgs}
|
wrapProgram $out/bin/retroarch ${wrapperArgs}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue