summaryrefslogtreecommitdiff
path: root/gnu/packages/backup.scm
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2023-11-05 16:21:25 +0100
committerMaxim Cournoyer <maxim@guixotic.coop>2025-11-20 14:37:54 +0900
commit9f752f9c47dda593fd5081ef2247a155158316a9 (patch)
tree02a510691f6561a389f242adc9b5b49156bf899e /gnu/packages/backup.scm
parentf8654d777ebe16949aeaf11060c4e54389cf6a55 (diff)
gnu: libarchive: Reference libraries absolutely via configure flags.add-compress-debug-symbols-phase
* gnu/packages/backup.scm (libarchive) [#:configure-flags]: Add 'LIBS' flag. [#:phases] {add--L-in-libarchive-pc}: Delete phase. Change-Id: I85f623043e98b82e46b9afe18c0be53cc7961d4b Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop> Modified-by: Maxim Cournoyer <maxim@guixotic.coop>
Diffstat (limited to 'gnu/packages/backup.scm')
-rw-r--r--gnu/packages/backup.scm48
1 files changed, 14 insertions, 34 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index a561c5fc7e3..48fb8de35b6 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -24,7 +24,7 @@
24;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop> 24;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop>
25;;; Copyright © 2022 Feng Shu <tumashu@163.com> 25;;; Copyright © 2022 Feng Shu <tumashu@163.com>
26;;; Copyright © 2023 Timo Wilken <guix@twilken.net> 26;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
27;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> 27;;; Copyright © 2023-2024 Nicolas Graves <ngraves@ngraves.fr>
28;;; Copyright © 2024 jgart <jgart@dismail.de> 28;;; Copyright © 2024 jgart <jgart@dismail.de>
29;;; Copyright © 2025 Kjartan Oli Agustsson <kjartanoli@outlook.com> 29;;; Copyright © 2025 Kjartan Oli Agustsson <kjartanoli@outlook.com>
30;;; Copyright © 2025 mstenek <mstenek@disroot.org> 30;;; Copyright © 2025 mstenek <mstenek@disroot.org>
@@ -54,7 +54,6 @@
54 #:use-module (guix build-system qt) 54 #:use-module (guix build-system qt)
55 #:use-module (guix download) 55 #:use-module (guix download)
56 #:use-module (guix gexp) 56 #:use-module (guix gexp)
57 #:use-module (guix gexp)
58 #:use-module (guix git-download) 57 #:use-module (guix git-download)
59 #:use-module (guix packages) 58 #:use-module (guix packages)
60 #:use-module (guix utils) 59 #:use-module (guix utils)
@@ -109,7 +108,8 @@
109 #:use-module (gnu packages time) 108 #:use-module (gnu packages time)
110 #:use-module (gnu packages tls) 109 #:use-module (gnu packages tls)
111 #:use-module (gnu packages valgrind) 110 #:use-module (gnu packages valgrind)
112 #:use-module (gnu packages xml)) 111 #:use-module (gnu packages xml)
112 #:use-module (ice-9 format))
113 113
114(define-public duplicity 114(define-public duplicity
115 (package 115 (package
@@ -287,12 +287,17 @@ backups (called chunks) to allow easy burning to CD/DVD.")
287 `(,zstd "lib"))) 287 `(,zstd "lib")))
288 (arguments 288 (arguments
289 (list 289 (list
290 ;; Embed absolute references to inputs to avoid propagation.
290 #:configure-flags 291 #:configure-flags
291 #~'("--disable-static" 292 #~(list "--disable-static"
292 ;; Because of the circular dependency, we cannot use openssl here. 293 (format #f "LIBS=~{-L~a/lib~^ ~}"
293 ;; Explicitly disable openssl to avoid unnecessary dependencies in the 294 '#$(map (lambda (x)
294 ;; pc file. 295 (this-package-input (car x)))
295 "--without-openssl") 296 (package-inputs this-package)))
297 ;; Because of the circular dependency, we cannot use openssl here.
298 ;; Explicitly disable openssl to avoid unnecessary dependencies in the
299 ;; pc file.
300 "--without-openssl")
296 #:phases 301 #:phases
297 #~(modify-phases %standard-phases 302 #~(modify-phases %standard-phases
298 (add-before 'build 'patch-commands 303 (add-before 'build 'patch-commands
@@ -327,32 +332,7 @@ backups (called chunks) to allow easy burning to CD/DVD.")
327 (invoke "./bsdcpio_test" "^test_owner_parse") 332 (invoke "./bsdcpio_test" "^test_owner_parse")
328 (invoke "./bsdtar_test")) 333 (invoke "./bsdtar_test"))
329 ;; Tests may be disabled if cross-compiling. 334 ;; Tests may be disabled if cross-compiling.
330 (format #t "Test suite not run.~%")))) 335 (format #t "Test suite not run.~%")))))))
331 (add-after 'install 'add--L-in-libarchive-pc
332 (lambda* (#:key inputs outputs #:allow-other-keys)
333 (let* ((out #$output)
334 (lib (string-append out "/lib"))
335 (nettle (assoc-ref inputs "nettle"))
336 (libxml2 (assoc-ref inputs "libxml2"))
337 (xz (assoc-ref inputs "xz"))
338 (zlib (assoc-ref inputs "zlib"))
339 (zstd (assoc-ref inputs "zstd"))
340 (bzip2 (assoc-ref inputs "bzip2")))
341 ;; Embed absolute references to these inputs to avoid propagation.
342 (substitute* (list (string-append lib "/pkgconfig/libarchive.pc")
343 (string-append lib "/libarchive.la"))
344 (("-lnettle")
345 (string-append "-L" nettle "/lib -lnettle"))
346 (("-lxml2")
347 (string-append "-L" libxml2 "/lib -lxml2"))
348 (("-llzma")
349 (string-append "-L" xz "/lib -llzma"))
350 (("-lz")
351 (string-append "-L" zlib "/lib -lz"))
352 (("-lzstd")
353 (string-append "-L" zstd "/lib -lzstd"))
354 (("-lbz2")
355 (string-append "-L" bzip2 "/lib -lbz2")))))))))
356 (home-page "https://libarchive.org/") 336 (home-page "https://libarchive.org/")
357 (synopsis "Multi-format archive and compression library") 337 (synopsis "Multi-format archive and compression library")
358 (description 338 (description