futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pack: Dereference symlinks when looking for executables.

Browse Source 
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'.
This commit is contained in:
Ludovic Courtès 2020-06-29 22:57:12 +02:00
parent b032d14ebd
commit 4f060bf2fe
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/scripts/pack.scm
View File

@ -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)