From 4f060bf2fe1dd8bec79cb07907b46e16fca21398 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 29 Jun 2020 22:57:12 +0200 Subject: pack: Dereference symlinks when looking for executables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Andrius Štikonas . * guix/scripts/pack.scm (wrapped-package)[build]: Add trailing slash to the arguments to 'find-files'. --- guix/scripts/pack.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'guix/scripts') diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index e0f9cc1a12..5bd405ade4 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -836,9 +836,10 @@ (define (build-wrapper program) (scandir input)) (for-each build-wrapper - (append (find-files (string-append input "/bin")) - (find-files (string-append input "/sbin")) - (find-files (string-append input "/libexec"))))))) + ;; Note: Trailing slash in case these are symlinks. + (append (find-files (string-append input "/bin/")) + (find-files (string-append input "/sbin/")) + (find-files (string-append input "/libexec/"))))))) (computed-file (string-append (cond ((package? package) -- cgit v1.2.3