public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30897 from flokli/borgbackup-ssh

Browse Source 
borgbackup: fix ssh binary location
This commit is contained in:
Frederik Rietdijk 2017-10-29 12:16:19 +01:00 committed by GitHub
commit bd7074961a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/backup/borg/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }: { stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "borgbackup-${version}"; name = "borgbackup-${version}";
@ -27,6 +27,10 @@ python3Packages.buildPythonApplication rec {
export BORG_LZ4_PREFIX="${lz4.dev}" export BORG_LZ4_PREFIX="${lz4.dev}"
''; '';
makeWrapperArgs = [
''--prefix PATH ':' "${openssh}/bin"''
];
postInstall = '' postInstall = ''
make -C docs singlehtml make -C docs singlehtml
mkdir -p $out/share/doc/borg mkdir -p $out/share/doc/borg
@ -45,6 +49,6 @@ python3Packages.buildPythonApplication rec {
homepage = https://borgbackup.github.io/; homepage = https://borgbackup.github.io/;
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
maintainers = with maintainers; [ nckx ]; maintainers = with maintainers; [ nckx flokli ];
}; };
} }