06/06: gnu: perl: Work around more "dotless @INC" build failures.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit ebd181138ea850c76103acb1fba3c84c3ba42ef8
Author: Marius Bakke <address@hidden>
Date:   Sun Aug 27 15:01:16 2017 +0200

    gnu: perl: Work around more "dotless @INC" build failures.
    
    * gnu/packages/perl.scm (perl-unicode-collate)[arguments]: Add
    'set-perl-search-path' phase.
    * gnu/packages/xorg.scm (perl-x11-xcb)[arguments]: Likewise.
---
 gnu/packages/perl.scm | 10 ++++++++++
 gnu/packages/xorg.scm |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 1a96ee2..93fc405 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -8165,6 +8165,16 @@ common serialisation formats such as JSON or CBOR.")
         (base32
          "1lq4p3mqqljhhy8wyiyahris33j4m5qfzpi6iacmcqjzw5g4afbm"))))
     (build-system perl-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'set-perl-search-path
+           (lambda _
+             ;; Work around "dotless @INC" build failure.
+             (setenv "PERL5LIB"
+                     (string-append (getcwd) ":"
+                                    (getenv "PERL5LIB")))
+             #t)))))
     (propagated-inputs
      `(("perl-unicode-normalize" ,perl-unicode-normalize)))
     (home-page "http://search.cpan.org/dist/Unicode-Collate";)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index a05a4ba..71d8e83 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5764,6 +5764,12 @@ programs that cannot use the window system directly.")
        #:parallel-build? #f
        #:phases
        (modify-phases %standard-phases
+         (add-before 'configure 'set-perl-search-path
+           (lambda _
+             (setenv "PERL5LIB"
+                     (string-append (getcwd) ":"
+                                    (getenv "PERL5LIB")))
+             #t))
          (add-before 'build 'patch-Makefile
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "Makefile"