From fe69b53fa7957406c373cd88750b5eec7a6389a6 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:55:02 +0200
Subject: [PATCH 1/3] guile-avahi: fix cross

---
 pkgs/by-name/gu/guile-avahi/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/gu/guile-avahi/package.nix b/pkgs/by-name/gu/guile-avahi/package.nix
index 3ad6ff9dd2c3..c75d4ee0f079 100644
--- a/pkgs/by-name/gu/guile-avahi/package.nix
+++ b/pkgs/by-name/gu/guile-avahi/package.nix
@@ -3,6 +3,7 @@
 , fetchgit
 , avahi
 , gmp
+, buildPackages
 , autoreconfHook
 , pkg-config
 , texinfo
@@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ];
   buildInputs = [ guile ];
   propagatedBuildInputs = [ avahi gmp ];

From 4d2590533ed4cd748c904545422a7b00850fd62c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:58:25 +0200
Subject: [PATCH 2/3] guile-gnutls: fix cross

---
 .../development/guile-modules/guile-gnutls/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix
index ae666077bf8f..952d2558d050 100644
--- a/pkgs/development/guile-modules/guile-gnutls/default.nix
+++ b/pkgs/development/guile-modules/guile-gnutls/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, buildPackages
 , gnutls
 , guile
 , libtool
@@ -19,16 +20,21 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
+  depsBuildBuild = [
+    buildPackages.stdenv.cc
+  ];
+
   nativeBuildInputs = [
+    gnutls
     guile
+    libtool
+    texinfo
     pkg-config
   ];
 
   buildInputs = [
     gnutls
     guile
-    libtool
-    texinfo
   ];
 
   configureFlags = [

From bd3f63ae1102b004bd2ec278e951324c10786891 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 24 Oct 2023 11:55:17 +0200
Subject: [PATCH 3/3] guile-disarchive: fix cross

---
 pkgs/by-name/gu/guile-disarchive/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gu/guile-disarchive/package.nix b/pkgs/by-name/gu/guile-disarchive/package.nix
index a81157db614e..f01047db34c5 100644
--- a/pkgs/by-name/gu/guile-disarchive/package.nix
+++ b/pkgs/by-name/gu/guile-disarchive/package.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     guile
+    guile-lzma
     pkg-config
   ];