From 5618193694b08855488b29fae1db42f05ca6deaf Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 20 Apr 2018 23:24:37 -0400 Subject: gnu: perl: Add more compatibility symlinks to the replacement perl. Fixes . Reported by Julien Lepiller . * 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. --- gnu/packages/perl.scm | 18 +++++++++--------- 1 file 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 @@ (define-public perl-5.26.2 (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 . - (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 + ;; and . + (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 -- cgit v1.2.3