switchboard: fix cross compilation

hosts/common/programs/switchboard.nix

@@ -6,7 +6,7 @@
         # switchboard-plug-a11y
         # switchboard-plug-about
         # switchboard-plug-applications
-        switchboard-plug-bluetooth
+        # switchboard-plug-bluetooth  #< TODO(2024/06/13): would be nice to have, but doesn't cross-compile
         # switchboard-plug-datetime
         # switchboard-plug-display  # could be handy, but crashes
         # switchboard-plug-keyboard
@@ -22,6 +22,7 @@
         switchboard-plug-sound
         # switchboard-plug-wacom
       ];
+      xorg = pkgs.buildPackages.xorg;  #< cross compilation fix (TODO: upstream)
     };
   };
 }

overlays/cross.nix

@@ -130,6 +130,53 @@ in with final; {
     # ];
   });
 
+  # bamf: required via pantheon.switchboard -> wingpanel -> gala
+  # bamf = prev.bamf.overrideAttrs (upstream: {
+  #   # "You must have gtk-doc >= 1.0 installed to build documentation"
+  #   depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
+  #     pkg-config  #< to find gtk-doc
+  #     (buildPackages.python3.withPackages (ps: with ps; [ lxml ])) # Tests
+  #   ];
+  #   # nativeBuildInputs = [
+  #   #   # (python3.withPackages (ps: with ps; [ lxml ])) # Tests
+  #   #   autoreconfHook
+  #   #   dbus
+  #   #   docbook_xsl
+  #   #   gnome.gnome-common
+  #   #   gobject-introspection
+  #   #   gtk-doc
+  #   #   pkg-config
+  #   #   vala
+  #   #   which
+  #   #   wrapGAppsHook3
+  #   #   xorg.xorgserver
+  #   # ] ++ [
+  #   # nativeBuildInputs = lib.tail upstream.nativeBuildInputs ++ [
+  #   nativeBuildInputs = (
+  #     lib.filter (p:
+  #       !lib.hasPrefix python3.pname (p.name or p.pname or "") &&
+  #       # ... i can't figure out where it's getting libX11 from :|
+  #       (p.pname or "") != xorg.xorgserver.pname &&
+  #       (p.pname or "") != gnome.gnome-common.pname
+  #     )
+  #     upstream.nativeBuildInputs
+  #   ) ++ [
+  #     buildPackages.gettext  #< for msgfmt
+  #   ];
+
+  #   buildInputs = upstream.buildInputs ++ [
+  #     xorg.xorgserver  #< upstream incorrectly places this in `nativeBuildInputs`
+  #   ];
+
+  #   # nativeBuildInputs = upstream.nativeBuildInputs ++ [
+  #   #   (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ lxml ])) # Tests
+  #   # ];
+  #   configureFlags = [
+  #     "--enable-gtk-doc"
+  #     # "--enable-headless-tests"  #< can't test when cross compiling
+  #   ];
+  # });
+
   # binutils = prev.binutils.override {
   #   # fix that resulting binary files would specify build #!sh as their interpreter.
   #   # dtrx is the primary beneficiary of this.
@@ -463,6 +510,12 @@ in with final; {
           --replace-fail "disabled_plugins = []" "disabled_plugins = ['power']"
       '';
     });
+    # gnome-settings-daemon43 = super.gnome-settings-daemon43.overrideAttrs (orig: {
+    #   postPatch = orig.postPatch + ''
+    #     substituteInPlace plugins/meson.build \
+    #       --replace-fail "disabled_plugins = []" "disabled_plugins = ['power']"
+    #   '';
+    # });
 
     # 2023/08/01: upstreaming is blocked on argyllcms, gnome-keyring, gnome-clocks, ibus, libavif, webp-pixbuf-loader (gnome-shell)
     # fixes: "gdbus-codegen not found or executable"
@@ -863,6 +916,30 @@ in with final; {
   #   # buildInputs = lib.remove gnupg upstream.buildInputs;
   # });
 
+  pantheon = prev.pantheon.overrideScope (self: super: {
+    # 2024/06/13: upstreaming is blocked by qtsvg/ffado
+    switchboard-plug-network = super.switchboard-plug-network.overrideAttrs (upstream: {
+      nativeBuildInputs = upstream.nativeBuildInputs ++ [
+        buildPackages.gettext  # <for msgfmt
+      ];
+    });
+    # 2024/06/13: upstreaming is unblocked; implemented on `pr-cross-switchboard-plugs-sound` branch
+    switchboard-plug-sound = super.switchboard-plug-sound.overrideAttrs (upstream: {
+      # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
+      #   pkg-config  #< so that it can find the right gettext/msgfmt
+      # ];
+      # everything requires an extra `buildPackages` than if i patched this inside nixpkgs itself: not sure why!
+      nativeBuildInputs = upstream.nativeBuildInputs ++ [
+        buildPackages.gettext  #< for msgfmt
+        # gettext  #< for msgfmt
+        buildPackages.glib
+      ];
+      env.PKG_CONFIG_GIO_2_0_GLIB_COMPILE_RESOURCES = "${lib.getDev buildPackages.buildPackages.glib}/bin/glib-compile-resources";
+
+      strictDeps = true;
+    });
+  });
+
   # fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"
   # 2024/05/31: upstreaming is blocked on appstream, libgweather, qtsvg
   # phoc = mvToNativeInputs [ wayland-scanner glib ] prev.phoc;

pkgs/additional/nixpkgs/list.nix

@@ -31,6 +31,12 @@ in
   #   hash = "sha256-5W/5/u2CXJJEgTjPx/do6SRZ6WEfhlAi/qXYS/Lsb14=";
   # })
 
+  # (fetchpatch' {
+  #   title = "pantheon.switchboard-plug-sound: support cross compilation";
+  #   saneCommit = "86f85de8d008710a11b7b3653ec594438374059e";
+  #   hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE=";
+  # })
+
   (fetchpatch' {
     title = "unl0kr: 2.0.0 -> 3.2.0";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/319126";