From 09f2f000cb2930575712adf30bd364a20b7e75da Mon Sep 17 00:00:00 2001
From: magic_rb <richard@brezak.sk>
Date: Sat, 7 Oct 2023 20:25:38 +0200
Subject: [PATCH] Fix usages of `getExe` in matrix containers

Signed-off-by: magic_rb <richard@brezak.sk>
---
 nixng/containers/matrix/heisenbridge/default.nix    | 4 ++--
 nixng/containers/matrix/mautrix-discord/default.nix | 8 ++++----
 nixng/containers/matrix/mautrix-signal/default.nix  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixng/containers/matrix/heisenbridge/default.nix b/nixng/containers/matrix/heisenbridge/default.nix
index 0cae0b3..7dec6e9 100644
--- a/nixng/containers/matrix/heisenbridge/default.nix
+++ b/nixng/containers/matrix/heisenbridge/default.nix
@@ -8,7 +8,7 @@
       { pkgs, lib, ... }:
       let
         inherit (lib)
-          getExe;
+          getExe';
       in
       {
         dumb-init = {
@@ -23,7 +23,7 @@
           script = pkgs.writeShellScript "heisenbridge" ''
             REGISTRATION_FILE="/var/lib/registrations/heisenbridge.yaml"
 
-            ${getExe pkgs.heisenbridge} 'https://matrix.redalder.org/' \
+            ${getExe' pkgs.heisenbridge "heisenbridge"} 'https://matrix.redalder.org/' \
                 -c "$REGISTRATION_FILE" \
                 $([ -e "$REGISTRATION_FILE" ] || echo "--generate") \
                 -l 127.0.0.1 \
diff --git a/nixng/containers/matrix/mautrix-discord/default.nix b/nixng/containers/matrix/mautrix-discord/default.nix
index 6661559..4982236 100644
--- a/nixng/containers/matrix/mautrix-discord/default.nix
+++ b/nixng/containers/matrix/mautrix-discord/default.nix
@@ -18,7 +18,7 @@
           script =
             let
               inherit (lib)
-                getExe;
+                getExe';
               mautrix-discord = (pkgs.appendOverlays [ config.flake.overlays.mautrix-discord ]).mautrix-discord;
             in
               pkgs.writeShellScript "mautrix-discord"
@@ -28,12 +28,12 @@
                   REGISTRATION_FILE="/var/lib/registrations/mautrix-discord.yaml"
                   DB_FILE="$DATA_DIR/sqlite.db"
 
-                  ${getExe pkgs.envsubst} < ${./mautrix-discord.yaml} > "$CONFIG_FILE"
+                  ${getExe' pkgs.envsubst "envsubst"} < ${./mautrix-discord.yaml} > "$CONFIG_FILE"
                   chmod 755 "$CONFIG_FILE"
 
                   [ -e "$REGISTRATION_FILE" ] || \
-                    ${getExe mautrix-discord} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -g
-                  ${getExe mautrix-discord} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -n
+                    ${getExe' mautrix-discord "mautrix-discord"} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -g
+                  ${getExe' mautrix-discord "mautrix-discord"} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -n
                 '';
         };
       };
diff --git a/nixng/containers/matrix/mautrix-signal/default.nix b/nixng/containers/matrix/mautrix-signal/default.nix
index 39d2eda..083e8d7 100644
--- a/nixng/containers/matrix/mautrix-signal/default.nix
+++ b/nixng/containers/matrix/mautrix-signal/default.nix
@@ -24,8 +24,8 @@
             cp ${./mautrix-signal.yaml} "$CONFIG_FILE" ; chmod 755 "$CONFIG_FILE"
 
             [ -e "$REGISTRATION_FILE" ] || \
-              ${lib.getExe pkgs.mautrix-signal} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -g
-            ${lib.getExe pkgs.mautrix-signal} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -n
+              ${lib.getExe' pkgs.mautrix-signal "mautrix-signal"} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -g
+            ${lib.getExe' pkgs.mautrix-signal "mautrix-signal"} -c "$CONFIG_FILE" -r "$REGISTRATION_FILE" -n
           '';
         };
 
@@ -38,7 +38,7 @@
             mkdir -p $(dirname $SOCKET_PATH)
 
             export LANG=en_US.UTF-8
-            ${lib.getExe pkgs.signald} -d $DATA_DIR -s $SOCKET_PATH
+            ${lib.getExe' pkgs.signald "signald"} -d $DATA_DIR -s $SOCKET_PATH
           '';
         };
       };