pkgsStatic.guile: fix build (#544832)

pkgs/development/interpreters/guile/3.0.nix

@@ -18,6 +18,7 @@
   pkgsBuildBuild,
   readline,
   writeScript,
+  pkgsStatic,
 }:
 
 let
@@ -88,12 +89,6 @@ builder rec {
   patches = [
     ./eai_system.patch
   ]
-  # Fix cross-compilation, can be removed at next release (as well as the autoreconfHook)
-  # Include this only conditionally so we don't have to run the autoreconfHook for the native build.
-  ++ lib.optional (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) (fetchpatch {
-    url = "https://cgit.git.savannah.gnu.org/cgit/guile.git/patch/?id=c117f8edc471d3362043d88959d73c6a37e7e1e9";
-    hash = "sha256-GFwJiwuU8lT1fNueMOcvHh8yvA4HYHcmPml2fY/HSjw=";
-  })
   ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
   ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch {
     url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
@@ -162,6 +157,8 @@ builder rec {
   setupHook = ./setup-hook-3.0.sh;
 
   passthru = rec {
+    tests.static = pkgsStatic.guile;
+
     effectiveVersion = lib.versions.majorMinor version;
     siteCcacheDir = "lib/guile/${effectiveVersion}/site-ccache";
     siteDir = "share/guile/site/${effectiveVersion}";
@@ -190,6 +187,7 @@ builder rec {
       system calls, networking support, multiple threads, dynamic linking, a
       foreign function call interface, and powerful string processing.
     '';
+    broken = stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isDarwin;
     license = lib.licenses.lgpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.all;