summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-08-27 15:01:16 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-08-27 15:07:21 +0200
commitebd181138ea850c76103acb1fba3c84c3ba42ef8 (patch)
tree9c6da529c5b1669569cc2668e67d9a7844515b74 /gnu
parent88d5889c40da131cb7ee7934bbda676b88ded4d7 (diff)
downloadguix-ebd181138ea850c76103acb1fba3c84c3ba42ef8.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/perl.scm10
-rw-r--r--gnu/packages/xorg.scm6
2 files changed, 16 insertions, 0 deletions
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 1a96ee237b..93fc4059d8 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 a05a4ba6e6..71d8e83fa4 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"