summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-04-20 23:24:37 -0400
committerMark H Weaver <mhw@netris.org>2018-04-20 23:29:14 -0400
commit5618193694b08855488b29fae1db42f05ca6deaf (patch)
tree627b3b73b145de617e1f5005a1a3be459cf8f224 /gnu
parent1af4212ae4bf357b691896984561d8b09544784e (diff)
downloadguix-5618193694b08855488b29fae1db42f05ca6deaf.tar.gz
gnu: perl: Add more compatibility symlinks to the replacement perl.
Fixes <https://bugs.gnu.org/31216>.
Reported by Julien Lepiller <julien@lepiller.eu>.

* gnu/packages/perl.scm (perl-5.26.2)[arguments]: Rename the
'workaround-grafting-version-bug' phase to 'install-compatibility-symlinks'.
Install symlinks in $out/lib/perl5/site_perl/5.26.1 and $out/bin/perl5.26.1,
in addition to $out/lib/perl5/5.26.1.  Simplify the code a bit.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/perl.scm18
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 33601f3f55..5b52ec071a 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -176,16 +176,16 @@
      (substitute-keyword-arguments (package-arguments perl)
        ((#:phases phases)
         `(modify-phases ,phases
-           ;; The path to libperl.so includes the Perl version number, and this
-           ;; is not handled by grafting. See <https://bugs.gnu.org/31210>.
-           (add-after 'install 'workaround-grafting-version-bug
+           ;; The path to several installed components include the Perl
+           ;; version number, and these is not rewritten by grafting.  See
+           ;; <https://bugs.gnu.org/31210> and <https://bugs.gnu.org/31216>.
+           (add-after 'install 'install-compatibility-symlinks
              (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (dir (string-append out "/lib/perl5"))
-                      (new "5.26.2")
-                      (old "5.26.1"))
-                 (with-directory-excursion dir
-                   (symlink new old))
+               (let ((out (assoc-ref outputs "out")))
+                 (symlink "perl5.26.2" (string-append out "/bin/perl5.26.1"))
+                 (symlink "5.26.2" (string-append out "/lib/perl5/5.26.1"))
+                 (symlink "5.26.2"
+                          (string-append out "/lib/perl5/site_perl/5.26.1"))
                  #t)))))))))
 
 (define-public perl-algorithm-c3