summary refs log tree commit diff
path: root/pkgs/tools/backup/borg
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2017-11-02 00:29:12 -0200
committerGitHub <noreply@github.com>2017-11-02 00:29:12 -0200
commitc07835a11bedd070aef2d2e86e7d03d579b560f3 (patch)
tree8b7f11859dd719c4d6dd7cfd83da5c541d5a6454 /pkgs/tools/backup/borg
parentd3763a7164e7c8b1b269add0d0ed1e8f316bbdc9 (diff)
parentbb6257bd3a22f79b00350966e9de0786cae26f5b (diff)
downloadnixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar
nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.gz
nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.bz2
nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.lz
nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.xz
nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.zst
nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.zip
Merge branch 'master' into upd.lxqt
Diffstat (limited to 'pkgs/tools/backup/borg')
-rw-r--r--pkgs/tools/backup/borg/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 219283de4cc8..6395b91fa73a 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }:
+{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }:
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
@@ -27,6 +27,10 @@ python3Packages.buildPythonApplication rec {
     export BORG_LZ4_PREFIX="${lz4.dev}"
   '';
 
+  makeWrapperArgs = [
+    ''--prefix PATH ':' "${openssh}/bin"''
+  ];
+
   postInstall = ''
     make -C docs singlehtml
     mkdir -p $out/share/doc/borg
@@ -45,6 +49,6 @@ python3Packages.buildPythonApplication rec {
     homepage = https://borgbackup.github.io/;
     license = licenses.bsd3;
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
-    maintainers = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx flokli ];
   };
 }