~ruther/guix-local

24478808756c2787e4cb60d2d0e97f87924d2aa4 — Ludovic Courtès 1 year, 5 months ago 1548403 
gexp: No symlinks for ‘imported-files/derivation’.

Fixes <https://issues.guix.gnu.org/76376>.

This is a followup to 149de38d0a2560277ee9bdda2104fbd45608bcb2, which
did not suitably follow symlinks.  The test case didn’t catch this
because, when using ‘--disable-chroot’, the symlink target is accessible
within the build environment.

* guix/gexp.scm (imported-files/derivation): Call ‘readlink*’ on ‘file-name’.

Co-authored-by: Ryan Sundberg <ryan@arctype.co>
Change-Id: Idc5b59cd8f0c1217e84c7cbfba64d97d5999429f
patch browse .tar.gz .zip 
1 files changed, 1 insertions(+), 1 deletions(-)

M guix/gexp.scm

M guix/gexp.scm => guix/gexp.scm +1 -1
@@ 1586,7 1586,7 @@ to the source files instead of copying them."
  (define file-pair
    (match-lambda
     ((final-path . (? string? file-name))
      (mlet %store-monad ((file (interned-file file-name
      (mlet %store-monad ((file (interned-file (readlink* file-name)
                                               (basename final-path))))
        (return (list final-path file))))
     ((final-path . file-like)