diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-10-29 12:16:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-29 12:16:19 +0100 |
| commit | bd7074961a82905336768e41233f5d69be4451a0 (patch) | |
| tree | f1080f24276cee2b1eecd1d3007a92b59bc65b91 /pkgs/tools/backup | |
| parent | 36039500487864df8226c6059314774960bc5d1b (diff) | |
| parent | f3b311af44bee935912f58a38a2344011e3ce78c (diff) | |
| download | nixlib-bd7074961a82905336768e41233f5d69be4451a0.tar nixlib-bd7074961a82905336768e41233f5d69be4451a0.tar.gz nixlib-bd7074961a82905336768e41233f5d69be4451a0.tar.bz2 nixlib-bd7074961a82905336768e41233f5d69be4451a0.tar.lz nixlib-bd7074961a82905336768e41233f5d69be4451a0.tar.xz nixlib-bd7074961a82905336768e41233f5d69be4451a0.tar.zst nixlib-bd7074961a82905336768e41233f5d69be4451a0.zip | |
Merge pull request #30897 from flokli/borgbackup-ssh
borgbackup: fix ssh binary location
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/borg/default.nix | 8 |
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 ]; }; } |