From abf80d765c5e5b44e45a3c76a420ae6b375e5990 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 29 Jul 2023 10:57:05 +0000
Subject: [PATCH] cross: fix nautilus; reduce emulation for tracker{,-miners}

---
 overlays/cross.nix                | 28 +++++++++++++++-------------
 overlays/disable-flakey-tests.nix |  8 +++++++-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/overlays/cross.nix b/overlays/cross.nix
index ec1b0db3..154ea239 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -520,15 +520,16 @@ in {
     #   # new failure mode: "/nix/store/grqh2wygy9f9wp5bgvqn4im76v82zmcx-binutils-2.39/bin/ld: /nix/store/f7yr5z123d162p5457jh3wzkqm7x8yah-glib-2.74.3/lib/libglib-2.0.so: error adding symbols: file in wrong format"
     #   inherit (emulated) stdenv;
     # };
-    # nautilus = (
-    #   addInputs {
-    #     # fixes: "meson.build:123:0: ERROR: Dependency "libxml-2.0" not found, tried pkgconfig"
-    #     buildInputs = [ final.libxml2 ];
-    #     # fixes: "meson.build:226:6: ERROR: Program 'gtk-update-icon-cache' not found or not executable"
-    #     nativeBuildInputs = [ final.gtk4 ];
-    #   }
-    #   super.nautilus
-    # ).override {
+    nautilus = (
+      addInputs {
+        # fixes: "meson.build:123:0: ERROR: Dependency "libxml-2.0" not found, tried pkgconfig"
+        buildInputs = [ final.libxml2 ];
+        # fixes: "meson.build:226:6: ERROR: Program 'gtk-update-icon-cache' not found or not executable"
+        nativeBuildInputs = [ final.gtk4 ];
+      }
+      super.nautilus
+    );
+    # .override {
     #   # fixes -msse2, -mfpmath=sse flags
     #   # wrapGAppsHook4 = final.wrapGAppsHook;
     #   # fixes -msse2, -mfpmath=ssh flags AND "Settings schema 'org.gtk.gtk4.Settings.FileChooser' is not installed"
@@ -1319,11 +1320,12 @@ in {
     '';
   });
   # fixes "meson.build:204:12: ERROR: Can not run test applications in this cross environment."
-  tracker = useEmulatedStdenv prev.tracker;
-  tracker-miners = prev.tracker-miners.override {
+  tracker = addNativeInputs [ final.mesonEmulatorHook ] prev.tracker;
+  # fixes "meson.build:425:23: ERROR: Program 'glib-compile-schemas' not found or not executable"
+  tracker-miners = mvToNativeInputs [ final.glib ] (
     # fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment."
-    inherit (emulated) stdenv;
-  };
+    addNativeInputs [ final.mesonEmulatorHook ] prev.tracker-miners
+  );
   tuba = prev.tuba.overrideAttrs (upstream: {
     # error: Package `{libadwaita-1,gtksourceview-5,libsecret-1,gee-0.8}' not found in specified Vala API directories or GObject-Introspection GIR directories
     buildInputs = upstream.buildInputs ++ [ final.vala ];
diff --git a/overlays/disable-flakey-tests.nix b/overlays/disable-flakey-tests.nix
index 2ec53bec..63053acd 100644
--- a/overlays/disable-flakey-tests.nix
+++ b/overlays/disable-flakey-tests.nix
@@ -8,12 +8,18 @@
 let
   dontCheck = p: p.overrideAttrs (_: {
     doCheck = false;
+    doInstallCheck = false;
+  });
+  dontCheckAarch64 = p: p.overrideAttrs (_: next.lib.optionalAttrs (p.stdenv.targetPlatform.system == "aarch64-linux") {
+    # only `dontCheck` if the package is being built for aarch64
+    doCheck = false;
+    doInstallCheck = false;
   });
 in {
   # 2023/07/27
   # 4 tests fail when building `host-pkgs.moby.emulated.elfutils`
   # it might be enough to only disable checks when targeting aarch64, which could reduce rebuilds?
-  elfutils = dontCheck prev.elfutils;
+  elfutils = dontCheckAarch64 prev.elfutils;
 
   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
     (py-next: py-prev: {