diff --git a/pkgs/pass2bw/default.nix b/pkgs/pass2bw/default.nix index 349d8d1..ce42f1f 100644 --- a/pkgs/pass2bw/default.nix +++ b/pkgs/pass2bw/default.nix @@ -2,6 +2,8 @@ stdenv, lib, makeWrapper, + pass, + pass2csv, python3, ... }: @@ -20,13 +22,18 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - sed -e "s|python ./convert_csvs.py|python $out/bin/convert_csvs.py|" \ - ${src}/${pname}.sh > $out/bin/${pname} + cp ${src}/pass2bw.sh $out/bin/${pname} chmod +x $out/bin/${pname} cp ${src}/convert_csvs.py $out/bin/ wrapProgram $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ python3 ]} + --prefix PATH : ${ + lib.makeBinPath [ + pass + pass2csv + python3 + ] + } ''; } diff --git a/pkgs/pass2bw/pass2bw.sh b/pkgs/pass2bw/pass2bw.sh index 95cb544..887a881 100644 --- a/pkgs/pass2bw/pass2bw.sh +++ b/pkgs/pass2bw/pass2bw.sh @@ -4,5 +4,5 @@ if [ "$#" -ne 2 ]; then fi pass2csv "$1" /tmp/pass.csv -python ./convert_csvs.py /tmp/pass.csv "$2" +python3 "$(dirname "$0")/convert_csvs.py" /tmp/pass.csv "$2" rm /tmp/pass.csv