From 486e25b9a4e149af8409de2abb0bb5f3c489df29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20=E2=9C=A8=F0=9F=8C=99=20Luna?= <alice@liquidnya.dev>
Date: Fri, 23 Jan 2026 22:53:01 +0100
Subject: [PATCH 1/2] app2unit: fix missing runtime dependency

The runtime dependency of xdg-terminal-exec is missing from app2unit.
This commit replaces `xdg-terminal-exec` with the nix store path of the xdg-terminal-exec executable. This makes it possible to run terminal applications with app2unit without having to install xdg-terminal-exec as well.
---
 pkgs/by-name/ap/app2unit/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix
index 904eb912f24d..eb59854c460f 100644
--- a/pkgs/by-name/ap/app2unit/package.nix
+++ b/pkgs/by-name/ap/app2unit/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   dash,
+  xdg-terminal-exec,
   scdoc,
   fetchFromGitHub,
   nix-update-script,
@@ -48,7 +49,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   dontPatchShebangs = true;
   postFixup = ''
     substituteInPlace $out/bin/app2unit \
-      --replace-fail '#!/bin/sh' '#!${lib.getExe dash}'
+      --replace-fail '#!/bin/sh' '#!${lib.getExe dash}' \
+      --replace-fail 'A2U__TERMINAL_HANDLER=xdg-terminal-exec' \
+                     'A2U__TERMINAL_HANDLER=${lib.getExe xdg-terminal-exec}'
   '';
 
   meta = {

From 9b8b026dce8c7abe351ed53527261833944731d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20=E2=9C=A8=F0=9F=8C=99=20Luna?= <alice@liquidnya.dev>
Date: Sat, 24 Jan 2026 22:25:19 +0100
Subject: [PATCH 2/2] app2unit: add withTerminalSupport argument

---
 pkgs/by-name/ap/app2unit/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix
index eb59854c460f..50b674b257c7 100644
--- a/pkgs/by-name/ap/app2unit/package.nix
+++ b/pkgs/by-name/ap/app2unit/package.nix
@@ -7,6 +7,7 @@
   fetchFromGitHub,
   nix-update-script,
   installShellFiles,
+  withTerminalSupport ? true,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "app2unit";
@@ -49,7 +50,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   dontPatchShebangs = true;
   postFixup = ''
     substituteInPlace $out/bin/app2unit \
-      --replace-fail '#!/bin/sh' '#!${lib.getExe dash}' \
+      --replace-fail '#!/bin/sh' '#!${lib.getExe dash}'
+  ''
+  + lib.optionalString withTerminalSupport ''
+    substituteInPlace $out/bin/app2unit \
       --replace-fail 'A2U__TERMINAL_HANDLER=xdg-terminal-exec' \
                      'A2U__TERMINAL_HANDLER=${lib.getExe xdg-terminal-exec}'
   '';