Skip to content

Commit 3c4ae90

Browse files
committedDec 21, 2024··
Fix upstream change
1 parent 08abfe9 commit 3c4ae90

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed
 

‎guix/rustup/build/toolchain.scm

+13-6
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,19 @@
337337
(lambda* (#:key inputs #:allow-other-keys)
338338
(for-each
339339
(lambda (input)
340-
(let* ((name (car input)))
341-
(when (equal? name "_")
342-
(let ((source (cdr input)))
343-
;; (format #t "source : ~a ...~%" source)
344-
(invoke "tar" "-xvf" source)))
345-
))
340+
(let* ((source (cdr input)))
341+
;; copied from gnu-build-system unpack
342+
(cond
343+
((string-suffix? ".zip" source)
344+
(invoke "unzip" source))
345+
((tarball? source)
346+
(invoke "tar" "xvf" source))
347+
(else
348+
(let ((name (strip-store-file-name source))
349+
(command (compressor source)))
350+
;; (copy-file source name)
351+
(when command
352+
(invoke command "--decompress" name)))))))
346353
inputs)
347354
))
348355
(delete 'patchelf)

0 commit comments

Comments
 (0)
Please sign in to comment.