branch master updated: gnu: zchunk: Patch references to the 'zstd' command line tool.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 448de39  gnu: zchunk: Patch references to the 'zstd' command line tool.
448de39 is described below

commit 448de3966eef81fe62999c7d728f7a458ab7bf86
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Aug 3 14:28:24 2021 -0400

    gnu: zchunk: Patch references to the 'zstd' command line tool.
    
    Fixes https://issues.guix.gnu.org/49795.
    
    * gnu/packages/compression.scm (zchunk)
    [phases]{patch-paths}: New phase.
    [inputs]: Add zstd.
    [propagated-inputs]: Relabel the zstd "lib" as "zstd:lib".
    
    Reported-by: Christopher Howard <christopher@librehacker.com>
---
 gnu/packages/compression.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 26cddb1..ecc767a 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2361,12 +2361,21 @@ reading from and writing to ZIP archives. ")
                (base32
                 "0nlzwnv6wh2yjyyv27f81jnvmk7psgpbnw7dsdp7frfkya569hgv"))))
     (build-system meson-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'patch-paths
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "src/zck_gen_zdict.c"
+                        (("/usr/bin/zstd")
+                         (string-append (assoc-ref inputs "zstd")
+                                        "/bin/zstd"))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("curl" ,curl)))
+     `(("curl" ,curl)
+       ("zstd" ,zstd)))
     (propagated-inputs
-     `(("zstd" ,zstd "lib")))           ;in Requires.private of zck.pc
+     `(("zstd:lib" ,zstd "lib")))       ;in Requires.private of zck.pc
     (home-page "https://github.com/zchunk/zchunk";)
     (synopsis "Compressed file format for efficient deltas")
     (description "The zchunk compressed file format allows splitting a file