cross: libpeas2: proper build fix, and work toward upstreaming

overlays/cross.nix

@@ -633,12 +633,12 @@ in with final; {
   #   '';
   # });
 
-  # 2024/08/12: upstreaming is unblocked
-  libpeas2 = prev.libpeas2.overrideAttrs (upstream: {
-    mesonFlags = upstream.mesonFlags ++ [
-      "-Dlua51=false"  #< fails to find lua (probably it incorrectly checks the build machine)
-    ];
-  });
+  # 2024/09/28: upstreaming is unblocked, implemented on branch `pr-libpeas2-cross`
+  # libpeas2 = prev.libpeas2.overrideAttrs (upstream: {
+  #   mesonFlags = upstream.mesonFlags ++ [
+  #     "-Dlua51=false"  #< fails to find lua (probably it incorrectly checks the build machine)
+  #   ];
+  # });
 
   # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
   #   phonon = super.phonon.overrideAttrs (orig: {

pkgs/additional/nixpkgs/list.nix

@@ -3,6 +3,7 @@ let
   fetchpatch' = {
     saneCommit ? null,
     nixpkgsCommit ? null,
+    saneGhCommit ? null,
     prUrl ? null,
     hash ? null,
     title ? null,
@@ -16,8 +17,10 @@ let
         "${prUrl}.diff?full_index=1"
       else if saneCommit != null then
         "https://git.uninsane.org/colin/nixpkgs/commit/${saneCommit}.diff"
-      else
+      else if nixpkgsCommit != null then
         "https://github.com/NixOS/nixpkgs/commit/${nixpkgsCommit}.patch?full_index=1"
+      else
+        "https://github.com/uninsane/nixpkgs/commit/${saneGhCommit}.patch?full_index=1"
       ;
     in fetchpatch2 (
       { inherit revert url; }
@@ -53,6 +56,13 @@ in
     hash = "sha256-/DESr9b7ZV7TPZ4ZMBIUiF6BxT2VzGSvri+7lRFXeLE=";
   })
 
+  (fetchpatch' {
+    # TODO: send upstream: <https://github.com/uninsane/nixpkgs/pull/new/pr-libpeas2-cross>
+    title = "libpeas2: fix cross compilation";
+    saneGhCommit = "7062afb2ff428fa0ee8b5635ae06d5adb6fbb396";
+    hash = "sha256-rvJLYnmZIr1WYzcZG6gGj/5bNPBRA3Vw/RslhGFjnR4=";
+  })
+
   (fetchpatch' {
     title = "wike: fix cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/338807";