From b0c0ca03a7f270b61d955ccfbc5ad58a11e3612d Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Fri, 25 Apr 2025 00:02:33 +0200
Subject: [PATCH] xastir: fix cross, enable strictDeps, update meta, modernize

---
 pkgs/by-name/xa/xastir/package.nix | 48 +++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/xa/xastir/package.nix b/pkgs/by-name/xa/xastir/package.nix
index 8c3c452a3b29..a9050f519a85 100644
--- a/pkgs/by-name/xa/xastir/package.nix
+++ b/pkgs/by-name/xa/xastir/package.nix
@@ -4,9 +4,12 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
+  bashNonInteractive,
   curl,
   db,
+  gnused,
   libgeotiff,
+  libtiff,
   xorg,
   motif,
   pcre2,
@@ -24,19 +27,22 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "xastir";
     repo = "xastir";
-    rev = "Release-${version}";
+    tag = "Release-${version}";
     hash = "sha256-EQXSfH4b5vMiprFcMXCUDNl+R1cHSj9CyhZnUPAMoCw=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
+    perl
   ];
 
   buildInputs = [
+    bashNonInteractive
     curl
     db
     libgeotiff
+    libtiff
     xorg.libXpm
     xorg.libXt
     motif
@@ -48,15 +54,41 @@ stdenv.mkDerivation rec {
     libax25
   ];
 
-  configureFlags = [ "--with-motif-includes=${motif}/include" ];
+  strictDeps = true;
 
-  postPatch = "patchShebangs .";
+  configureFlags = [
+    "--with-motif-includes=${lib.getDev motif}/include"
+    "ac_cv_path_gm=${lib.getExe' graphicsmagick "gm"}"
+    "ac_cv_path_convert=${lib.getExe' graphicsmagick "convert"}"
+    "ac_cv_header_xtiffio_h=yes"
+    "ac_cv_path_GMAGIC_BIN=${lib.getExe' (lib.getDev graphicsmagick) "GraphicsMagick-config"}"
+  ];
 
-  meta = with lib; {
+  makeFlags = [
+    "AR=${stdenv.cc.targetPrefix}ar"
+  ];
+
+  postPatch = ''
+    patchShebangs --build scripts/lang*.pl
+
+    # checks for files in /usr/bin/
+    substituteInPlace acinclude.m4 \
+      --replace-fail "AC_CHECK_FILE" "# AC_CHECK_FILE"
+    # would pick up builder sed from $PATH
+    substituteInPlace configure.ac \
+      --replace-fail 'AC_DEFINE_UNQUOTED(SED_PATH, "''${sed}", [Path to sed])' \
+                     'AC_DEFINE_UNQUOTED(SED_PATH, "${lib.getExe gnused}", [Path to sed])'
+  '';
+
+  preInstall = ''
+    patchShebangs --host --update .
+  '';
+
+  meta = {
     description = "Graphical APRS client";
-    homepage = "https://xastir.org";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.ehmry ];
-    platforms = platforms.linux;
+    homepage = "https://github.com/xastir/xastir";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.ehmry ];
+    platforms = lib.platforms.linux;
   };
 }