From 240d44bc7475f47a88d0b4cdcb1da341dcf2716d Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 19 Nov 2024 11:55:48 +0000
Subject: [PATCH 1/2] gjs: assign meta.mainProgram

---
 pkgs/by-name/gj/gjs/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix
index fee889cbd537..d2c90bcff1a5 100644
--- a/pkgs/by-name/gj/gjs/package.nix
+++ b/pkgs/by-name/gj/gjs/package.nix
@@ -147,6 +147,7 @@ in stdenv.mkDerivation (finalAttrs: {
     description = "JavaScript bindings for GNOME";
     homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md";
     license = licenses.lgpl2Plus;
+    mainProgram = "gjs";
     maintainers = teams.gnome.members;
     platforms = platforms.unix;
   };

From 7a9a2d8f34e19b1002b12f8cbd5fe962843fa4c8 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 19 Nov 2024 11:56:26 +0000
Subject: [PATCH 2/2] gnome-maps: fix cross compilation

upstream determines the gjs path with `find_program('gjs')`, however
this fails to find anything when cross compiling because meson doesn't
know which paths to check.

the interaction between meson's `find_program` and `cross-file` is
documented here:
<https://mesonbuild.com/Reference-manual_functions.html#find_program>
---
 pkgs/by-name/gn/gnome-maps/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix
index 27eee47cbf61..c8d8785c9349 100644
--- a/pkgs/by-name/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@@ -25,6 +25,7 @@
   libadwaita,
   geocode-glib_2,
   tzdata,
+  writeText,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -68,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: {
     libsoup_3
   ];
 
+  mesonFlags = [
+    "--cross-file=${writeText "crossfile.ini" ''
+      [binaries]
+      gjs = '${lib.getExe gjs}'
+    ''}"
+  ];
+
   preCheck = ''
     # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema.
     export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS"