From 73ddbe22f0130d4861e4f1f8458e1cbfa30df615 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 9 Mar 2025 23:01:59 +0000
Subject: [PATCH] libqmi: fix cross via upstream patch

---
 overlays/cross.nix                         | 8 --------
 pkgs/by-name/nixpkgs-bootstrap/patches.nix | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/overlays/cross.nix b/overlays/cross.nix
index 410542205..0f36a9fec 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -470,14 +470,6 @@ in with final; {
 
   lemoa = prev.lemoa.override { cargo = crossCargo; };
 
-  libqmi = prev.libqmi.overrideAttrs (upstream: {
-    # gtk-doc fails (even with mesonEmulatorHook present)
-    outputs = lib.remove "devdoc" upstream.outputs;
-    mesonFlags = (lib.remove "-Dgtk_doc=true" upstream.mesonFlags) ++ [
-      "-Dgtk_doc=false"
-    ];
-  });
-
   # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
   #   phonon = super.phonon.overrideAttrs (orig: {
   #     # fixes "ECM (required version >= 5.60), Extra CMake Modules"
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index 3b2219906..fa387d50f 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -40,6 +40,13 @@ in
     hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc=";
   })
 
+  (fetchpatch' {
+    # 2025-03-07: testing before merge
+    name = "libqmi: unbreak cross compilation";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/388297";
+    hash = "sha256-iW6b3yNWzWq2CrbtVVFvkhPdNwmRCjUTqLMq4mEHAV4=";
+  })
+
   (fetchpatch' {
     # 2025-03-07: merged into staging
     name = "librsvg: generate loaders.cache even when cross compiling";