aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan Tildesley <mail@brendan.scot>2020-09-13 15:45:56 +1000
committerLudovic Courtès <ludo@gnu.org>2021-04-22 14:04:27 +0200
commitb6753aa1e1041df0a787ec28e58384dc10a3c05c (patch)
tree314de302ddd0ec68852a833bc0b2d2c51d10e1bf
parented42b2caba0e69b056c2d2cc35ba7ca8c0e5cb10 (diff)
downloadguix-b6753aa1e1041df0a787ec28e58384dc10a3c05c.tar.gz
guix-b6753aa1e1041df0a787ec28e58384dc10a3c05c.zip
rakudo-build-system: Don't double wrap programs.
* guix/build/rakudo-build-system.scm (wrap): Don't return any potential already wrapped-programs in the list-of-files to wrap. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--guix/build/rakudo-build-system.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/build/rakudo-build-system.scm b/guix/build/rakudo-build-system.scm
index dbdeb1ccd2..b2c090f946 100644
--- a/guix/build/rakudo-build-system.scm
+++ b/guix/build/rakudo-build-system.scm
@@ -97,7 +97,8 @@
(map (cut string-append dir "/" <>)
(or (scandir dir (lambda (f)
(let ((s (stat (string-append dir "/" f))))
- (eq? 'regular (stat:type s)))))
+ (and (eq? 'regular (stat:type s))
+ (not (wrapped-program? f))))))
'())))
(define bindirs