summaryrefslogtreecommitdiff
path: root/gnu/packages/compression.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-04-28 16:24:46 +0200
committerLudovic Courtès <ludo@gnu.org>2022-04-28 16:24:46 +0200
commit284fa7264963acc5d114ef5d54c347126b1654ba (patch)
tree3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/compression.scm
parent12c9da35389dfba86ae0d863132a6b2c4374205a (diff)
parent882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff)
downloadguix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar
guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/compression.scm')
-rw-r--r--gnu/packages/compression.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 3edaecd951..e1d8f721a3 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -411,8 +411,10 @@ decompression.")
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'unpack-gnulib
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gnulib (assoc-ref inputs "gnulib")))
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (let ((gnulib
+ (dirname (search-input-file (or native-inputs inputs)
+ "gnulib-tool.py"))))
(copy-recursively gnulib "lib")
(setenv "PATH" (string-append "lib:" (getenv "PATH")))
#t)))