From 48c76e72a861fee2f5dc1b5ddcc0a26230c61a9f Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Wed, 24 Nov 2021 00:07:29 +0100
Subject: [PATCH] minor fixes

---
 flake.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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