Macintosh-Tools
/
Retro68
mirror of https://github.com/autc04/Retro68.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve flake setup

This commit is contained in:
Wolfgang Thaller 2021-11-23 22:45:44 +01:00
parent 09f857cc2b
commit 76b6e67f4e
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
flake.nix
View File

@ -42,11 +42,12 @@
}; };
}; };
bfdEmulation = "m68k"; bfdEmulation = "m68k";
isStatic = true;
}; };
powerpc = { powerpc = {
system = "powerpc-macos"; system = "powerpc-macos";
config = "powerpc-apple-macos"; config = "powerpc-apple-macos";
libc = "newlib"; libc = "retro68";
parsed = { parsed = {
cpu = { cpu = {
name = "powerpc"; name = "powerpc";
@ -63,7 +64,7 @@
carbon = { carbon = {
system = "powerpc-carbon"; system = "powerpc-carbon";
config = "powerpc-apple-carbon"; config = "powerpc-apple-carbon";
libc = "newlib"; libc = "retro68";
parsed = { parsed = {
cpu = { cpu = {
name = "powerpc"; name = "powerpc";
@ -80,8 +81,6 @@
}; };
in { in {
inherit retroSystems;
# A Nixpkgs overlay. # A Nixpkgs overlay.
overlay = pkgs: prev: overlay = pkgs: prev:
let filterSrc = pkgs.nix-gitignore.gitignoreSource [ ]; let filterSrc = pkgs.nix-gitignore.gitignoreSource [ ];
@ -96,8 +95,24 @@
enableParallelBuilding = true; enableParallelBuilding = true;
}; };
retro68_binutils_m68k_with_tools = with pkgs;
symlinkJoin {
name = "retro68_buinutils_m68k_with_tools";
paths = [ retro68_binutils_m68k buildPackages.retro68_tools ];
# Move the real linker aside and install symlinks to Elf2Mac
postBuild = ''
mv $out/bin/m68k-apple-macos-ld $out/bin/m68k-apple-macos-ld.real
mv $out/m68k-apple-macos/bin/ld $out/m68k-apple-macos/bin/ld.real
ln -s $out/bin/Elf2Mac $out/bin/m68k-apple-macos-ld
ln -s $out/bin/Elf2Mac $out/m68k-apple-macos/bin/ld
'';
};
binutils = if pkgs.stdenv.targetPlatform.system == "m68k-macos" then binutils = if pkgs.stdenv.targetPlatform.system == "m68k-macos" then
pkgs.wrapBintoolsWith { bintools = pkgs.retro68_binutils_m68k; } pkgs.wrapBintoolsWith {
bintools = pkgs.retro68_binutils_m68k_with_tools;
}
else else
prev.binutils; prev.binutils;
@ -107,6 +122,7 @@
extraBuildCommands = '' extraBuildCommands = ''
echo "" > $out/nix-support/add-hardening.sh echo "" > $out/nix-support/add-hardening.sh
''; '';
extraPackages = with pkgs.targetPackages; [ multiversal libretro ];
} }
else else
prev.gcc; prev.gcc;
@ -118,7 +134,8 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "retro68_gcc_m68k"; name = "retro68_gcc_m68k";
src = filterSrc (self + /gcc); src = filterSrc (self + /gcc);
buildInputs = [ retro68_binutils_m68k gmp mpfr libmpc ]; buildInputs =
[ retro68_binutils_m68k_with_tools gmp mpfr libmpc ];
configureFlags = [ configureFlags = [
"--target=m68k-apple-macos" "--target=m68k-apple-macos"
"--enable-languages=c,c++" "--enable-languages=c,c++"
@ -133,7 +150,7 @@
# nix does in-source builds by default, and something breaks # nix does in-source builds by default, and something breaks
buildCommand = '' buildCommand = ''
mkdir -p $out/m68k-apple-macos/bin mkdir -p $out/m68k-apple-macos/bin
ln -s ${retro68_binutils_m68k}/m68k-apple-macos/bin/* $out/m68k-apple-macos/bin/ ln -s ${retro68_binutils_m68k_with_tools}/m68k-apple-macos/bin/* $out/m68k-apple-macos/bin/
export target_configargs="--disable-nls --enable-libstdcxx-dual-abi=no --disable-libstdcxx-verbose" export target_configargs="--disable-nls --enable-libstdcxx-dual-abi=no --disable-libstdcxx-verbose"
$src/configure "--target=m68k-apple-macos" "--enable-languages=c,c++" "--with-arch=m68k" "--with-cpu=m68000" "--disable-libssp" "MAKEINFO=missing" --prefix=$out $src/configure "--target=m68k-apple-macos" "--enable-languages=c,c++" "--with-arch=m68k" "--with-cpu=m68000" "--disable-libssp" "MAKEINFO=missing" --prefix=$out
@ -143,14 +160,10 @@
}; };
multiversal = with pkgs; multiversal = with pkgs;
stdenvNoCC.mkDerivation { (pkgs.stdenv.override { cc = stdenv.cc.override { extraPackages = []; }; }).mkDerivation {
name = "multiversal"; name = "multiversal";
src = multiversal_src; src = multiversal_src;
nativeBuildInputs = [ nativeBuildInputs = [ buildPackages.ruby ];
buildPackages.ruby
buildPackages.retro68_gcc_m68k
buildPackages.retro68_binutils_m68k
];
buildCommand = '' buildCommand = ''
echo $src echo $src
build=`pwd` build=`pwd`
@ -199,11 +212,11 @@
}; };
libretro = with pkgs; libretro = with pkgs;
pkgs.stdenv.mkDerivation { (pkgs.stdenv.override { cc = stdenv.cc.override { extraPackages = []; }; }).mkDerivation {
name = "libretro"; name = "libretro";
src = filterSrc (self + /libretro); src = filterSrc (self + /libretro);
nativeBuildInputs = with pkgs; [ buildPackages.cmake ]; nativeBuildInputs = [ buildPackages.cmake ];
buildInputs = [ multiversal ]; buildInputs = [ multiversal ];
buildCommand = '' buildCommand = ''
@ -220,20 +233,22 @@
}; };
# Provide some binary packages for selected system types. # Provide some binary packages for selected system types.
packages = forAllSystems (system: { packages = forAllSystems (system: rec {
inherit (nixpkgsFor.${system}) inherit (nixpkgsFor.${system})
retro68_binutils_m68k retro68_gcc_m68k multiversal hfsutils retro68_binutils_m68k retro68_gcc_m68k multiversal hfsutils
libretro_m68k retro68_tools; libretro_m68k retro68_tools;
crosstest = let crossPkgs = (import nixpkgs { inherit system; }).lib.mapAttrs
pkgs = import nixpkgs { (name: plat:
inherit system; import nixpkgs {
overlays = [ self.overlay ]; inherit system;
crossSystem = retroSystems.m68k; overlays = [ self.overlay ];
}; crossSystem = plat;
config = { allowUnsupportedSystem = true; };
}) retroSystems;
crosstest = let pkgs = crossPkgs.m68k;
in pkgs.stdenv.mkDerivation { in pkgs.stdenv.mkDerivation {
#nativeBuildInputs = [pkgs.binutils]; # [nixpkgsFor.${system}.retro68_binutils_m68k_wrapped];
buildInputs = [ pkgs.multiversal pkgs.libretro ];
name = "crosstest"; name = "crosstest";
meta = { platforms = [ "m68k-macos" ]; }; meta = { platforms = [ "m68k-macos" ]; };
}; };