Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2025-01-18 20:31:19 +00:00
Code Issues Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Wolfgang Thaller 2021-11-24 00:07:29 +01:00
parent 1559630536
commit 48c76e72a8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -122,7 +122,7 @@
ln -s $out/bin/Elf2Mac $out/m68k-apple-macos/bin/ld ln -s $out/bin/Elf2Mac $out/m68k-apple-macos/bin/ld
''; '';
} }
else binutils1; else retro68_binutils;
binutils = if pkgs.stdenv.targetPlatform ? retro68 then binutils = if pkgs.stdenv.targetPlatform ? retro68 then
pkgs.wrapBintoolsWith { pkgs.wrapBintoolsWith {
@ -173,7 +173,7 @@
}; };
multiversal = with pkgs; multiversal = with pkgs;
(pkgs.stdenv.override { cc = stdenv.cc.override { extraPackages = []; }; }).mkDerivation { (stdenv.override { cc = stdenv.cc.override { extraPackages = []; }; }).mkDerivation {
name = "multiversal"; name = "multiversal";
src = multiversal_src; src = multiversal_src;
nativeBuildInputs = [ buildPackages.ruby ]; nativeBuildInputs = [ buildPackages.ruby ];
@ -183,8 +183,13 @@
(cd $src && ruby make-multiverse.rb -G CIncludes -o "$build") (cd $src && ruby make-multiverse.rb -G CIncludes -o "$build")
mkdir $out mkdir $out
cp -r CIncludes $out/include cp -r CIncludes $out/include
''
+ (if stdenv.targetPlatform.system == "m68k-macos" then
''
cp -r lib68k $out/lib cp -r lib68k $out/lib
''; ''
else "")
;
meta = { platforms = [ "m68k-macos" ]; }; meta = { platforms = [ "m68k-macos" ]; };
}; };