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

Merge pull request #38977 from Moredread/borg/libb2

Browse Source 
borgbackup: add blake2 library to build inputs
This commit is contained in:
Robert Schütz 2018-04-16 23:47:49 +02:00 committed by GitHub
commit 0a9b43658a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, python3Packages, acl, lz4, openssl, openssh }: { stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "borgbackup"; pname = "borgbackup";
@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
sphinx guzzle_sphinx_theme sphinx guzzle_sphinx_theme
]; ];
buildInputs = [ buildInputs = [
lz4 openssl python3Packages.setuptools_scm libb2 lz4 zstd openssl python3Packages.setuptools_scm
] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
cython msgpack-python cython msgpack-python
@ -28,6 +28,8 @@ python3Packages.buildPythonApplication rec {
preConfigure = '' preConfigure = ''
export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_OPENSSL_PREFIX="${openssl.dev}"
export BORG_LZ4_PREFIX="${lz4.dev}" export BORG_LZ4_PREFIX="${lz4.dev}"
export BORG_LIBB2_PREFIX="${libb2}"
export BORG_LIBZSTD_PREFIX="${zstd}"
''; '';
makeWrapperArgs = [ makeWrapperArgs = [