Merge pull request #293078 from dotlambda/pika-backup-0.7.0

diff --git a/src/borg/process.rs b/src/borg/process.rs

index 63ea0ee..e3535e0 100644

index 9af8da7..85bcbf8 100644

--- a/src/borg/process.rs

+++ b/src/borg/process.rs

@@ -203,7 +203,7 @@ impl BorgCall {

@@ -278,7 +278,7 @@ impl BorgCall {

     }

     pub fn cmd(&self) -> Result<process::Command> {

-        let mut cmd = process::Command::new("borg");

+        let mut cmd = process::Command::new("@borg@");

         cmd.envs([self.set_password()?]);

@@ -221,7 +221,7 @@ impl BorgCall {

     }

     pub fn cmd_async(&self) -> Result<async_process::Command> {

     pub(super) fn command(&self) -> Result<(async_process::Command, UnixStream)> {

-        let mut cmd = async_process::Command::new("borg");

+        let mut cmd = async_process::Command::new("@borg@");

         cmd.envs([self.set_password()?]);

         let unix_stream = self.stream_password(&mut cmd)?;

stdenv.mkDerivation rec {

  pname = "pika-backup";

  version = "0.6.2";

  version = "0.7.0";

  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "World";

    repo = "pika-backup";

    rev = "v${version}";

    hash = "sha256-RTeRlfRmA/fXBcdzP41mbs88ArKlbU49AA0lnW3xRlg=";

    hash = "sha256-WeFc/4TEIxw6uzLroJX1D/rEA419sghkjBt1nsPv2Ho=";

  };

  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-2B0N/Yq9A4LqKh8EKWmzNzTelwGE3Y9FL9IAqAgFSV8=";

    hash = "sha256-fgPgUZxye9YUyX9/+hTye3cUypgRAegZMUTKfPxVH4s=";

  };

  patches = [

    (substituteAll {

      src = ./borg-path.patch;

      borg = "${borgbackup}/bin/borg";

      borg = lib.getExe borgbackup;

    })

  ];