diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-08-30 17:32:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 10:31:32 -0500 |
| commit | ac4417328d58f08105afd48545ba945b25f5e666 (patch) | |
| tree | 1e9c0258e8591f3e90285ff651530e696de00f21 | |
| parent | 8a613f9d4ed4941eef915e98f462c56f883aba2a (diff) | |
guix: packages: Fix repacking of plain tarballs.
Fixes <https://issues.guix.gnu.org/50066>.
* guix/packages.scm (patch-and-repack): Test for a tarball using tarball? and
move the plain file copy to the else clause.
Reported-by: Mathieu Othacehe <othacehe@gnu.org>
| -rw-r--r-- | guix/packages.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index fb7eabdc64..083ee6d3b6 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -981,10 +981,10 @@ specifies modules in scope when evaluating SNIPPET." ((file-is-directory? #+source) (copy-recursively directory #$output #:log (%make-void-port "w"))) - ((not #+comp) - (copy-file file #$output)) - (else - (repack directory #$output))))))) + ((or #+comp (tarball? #+source)) + (repack directory #$output)) + (else ;single uncompressed file + (copy-file file #$output))))))) (let ((name (if (or (checkout? original-file-name) (not (compressor original-file-name))) |