diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-12-30 16:03:37 +0000 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-01-08 07:58:31 +0100 |
| commit | 19278d8da97f1efb283666dd40a873dfdc6bb9e8 (patch) | |
| tree | 7336a4bd8154a64dd97c31e8e680ba1f0b32ca29 | |
| parent | c6220b13014f47a0aeb29975cdcf3c3b2b880b9d (diff) | |
| download | guix-19278d8da97f1efb283666dd40a873dfdc6bb9e8.tar.gz guix-19278d8da97f1efb283666dd40a873dfdc6bb9e8.zip | |
gnu: borg: Unbundle libb2.
* gnu/packages/backup.scm (borg)[source]: Remove bundled libb2 in snippet.
[inputs]: Add libb2.
[arguments]: Use it.
| -rw-r--r-- | gnu/packages/backup.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 2fba1a9e76..cfeaa207be 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> -;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> @@ -37,6 +37,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) #:use-module (gnu packages ftp) @@ -483,7 +484,7 @@ detection, and lossless compression.") ;; Remove bundled shared libraries. (with-directory-excursion "src/borg/algorithms" (for-each delete-file-recursively - (list "lz4" "zstd"))))))) + (list "blake2" "lz4" "zstd"))))))) (build-system python-build-system) (arguments `(#:modules ((srfi srfi-26) ; for cut @@ -494,9 +495,11 @@ detection, and lossless compression.") (add-after 'unpack 'set-env (lambda* (#:key inputs #:allow-other-keys) (let ((openssl (assoc-ref inputs "openssl")) + (libb2 (assoc-ref inputs "libb2")) (lz4 (assoc-ref inputs "lz4")) (zstd (assoc-ref inputs "zstd"))) (setenv "BORG_OPENSSL_PREFIX" openssl) + (setenv "BORG_LIBB2_PREFIX" libb2) (setenv "BORG_LIBLZ4_PREFIX" lz4) (setenv "BORG_LIBZSTD_PREFIX" zstd) (setenv "PYTHON_EGG_CACHE" "/tmp") @@ -558,6 +561,7 @@ detection, and lossless compression.") ("python-guzzle-sphinx-theme" ,python-guzzle-sphinx-theme))) (inputs `(("acl" ,acl) + ("libb2" ,libb2) ("lz4" ,lz4) ("openssl" ,openssl) ("python-llfuse" ,python-llfuse) |