From 914e7b2e76a6d02fc5164c907c8db665513cb98c Mon Sep 17 00:00:00 2001
From: Sense T <me@sense-t.eu.org>
Date: Sat, 1 Mar 2025 19:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=AD=BB=E4=BA=86=E2=80=A6=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qzsec/access-client/access-client |  6 ++++++
 qzsec/access-client/package.nix   | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/qzsec/access-client/access-client b/qzsec/access-client/access-client
index 93683d9..9b20e61 100644
--- a/qzsec/access-client/access-client
+++ b/qzsec/access-client/access-client
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+export PATH=$PATH:@PATH
+
 URL="$1"
 
 if [ "$URL" == "" ]; then
@@ -34,4 +36,8 @@ PORT_NUM=$(echo $ARGS | jq -r .pn)
 USERNAME=$(echo $ARGS | jq -r .un)
 PASSWORD=$(echo $ARGS | jq -r .pw)
 
+TITLE=$(echo $ARGS | jq -r .st)
+
+echo "Will connect to $TITLE..."
+
 passh -p "$PASSWORD" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -p $PORT_NUM $USERNAME@$HOSTNAME
\ No newline at end of file
diff --git a/qzsec/access-client/package.nix b/qzsec/access-client/package.nix
index 77b1c35..f827328 100644
--- a/qzsec/access-client/package.nix
+++ b/qzsec/access-client/package.nix
@@ -1,9 +1,13 @@
 {
   stdenv,
+  lib,
 
   jq,
   zlib-ng,
   passh,
+  coreutils,
+  openssh,
+  which,
   ...
 }:
 let
@@ -18,16 +22,26 @@ stdenv.mkDerivation rec {
     jq
     zlib-ng
     passh
+    coreutils
+    openssh
+  ];
+
+  nativeBuildInputs = [
+    coreutils
+    which
   ];
 
   phases = [ "installPhase" ];
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -rv "${bin}" $out/bin/${pname}
+    sed "/^export PATH=/s|@PATH|${coreutils}/bin:${jq}/bin:${passh}/bin:${zlib-ng.bin}/bin:${openssh}/bin|" "${bin}" > $out/bin/${pname}
     chmod +x $out/bin/${pname}
 
     mkdir -p $out/share/applications
     sed "/^Version=/s|@VERSION|${version}|" "${desktop}" | sed "/^Exec=/s|@EXEC|$out/bin/${pname}|" > "$out/share/applications/${pname}.desktop"
+
+    echo "PATH: $PATH"
+    which jq && which minideflate && which passh && which ssh || exit 1
   '';
 }