From ac4417328d58f08105afd48545ba945b25f5e666 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 30 Aug 2021 17:32:21 -0400
Subject: 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>
---
 guix/packages.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'guix')

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 @@ (define (repack directory output)
                ((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)))
-- 
cgit v1.2.3