02/08: pack: Dereference symlinks when looking for executables.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 4f060bf2fe1dd8bec79cb07907b46e16fca21398
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jun 29 22:57:12 2020 +0200

    pack: Dereference symlinks when looking for executables.
    
    Fixes <https://bugs.gnu.org/42127>.
    Reported by Andrius Štikonas <andrius@stikonas.eu>.
    
    * 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(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index e0f9cc1..5bd405a 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -836,9 +836,10 @@ last resort for relocation."
                     (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)