This commit is contained in:
Wolfgang Thaller 2021-11-27 12:34:16 +01:00
parent 6258f1e0c0
commit 000fe4d712

View File

@ -79,8 +79,7 @@ let
};
# A Nixpkgs overlay.
overlay = pkgs: prev:
{
overlay = pkgs: prev: {
# ----------- Native Tools -------------
# hfsutils -- Utilities for manipulating HFS volumes & disk images.
@ -272,14 +271,14 @@ let
cp -r RIncludes $out/
'' + (if stdenv.targetPlatform.system == "m68k-macos" then ''
cp -r lib68k $out/lib
'' else ''
'');
'' else
"");
meta = { platforms = [ "m68k-macos" ]; };
};
import-libraries = with pkgs;
if stdenvNoCC.targetPlatform != retroSystems.m68k
then stdenvNoCC.mkDerivation {
if stdenvNoCC.targetPlatform != retroSystems.m68k then
stdenvNoCC.mkDerivation {
name = "import-libraries";
src = ./ImportLibraries;
buildCommand = ''
@ -287,7 +286,8 @@ let
cp $src/*.a $out/lib/
'';
}
else null;
else
null;
libretro = with pkgs;
let
@ -342,4 +342,4 @@ let
[ pkgs.hfsutils pkgs.retro68_tools pkgs.cmake pkgs.gnumake ];
} // cross) crossPkgs;
in shell.m68k // shell // { inherit overlay; }
in shell.m68k // shell // { inherit overlay; }