3 files changed, 16 insertions(+), 8 deletions(-)

M guix/build-system/cmake.scm
M guix/build-system/gnu.scm
M guix/build-system/perl.scm

@@ 72,7 72,8 @@ provides a 'CMakeLists.txt' file as its build system."
                     #:outputs %outputs
                     #:inputs %build-inputs
                     #:search-paths ',(map search-path-specification->sexp
-                                          search-paths)
+                                          (append search-paths
+                                                  (standard-search-paths)))
                     #:patches ,patches
                     #:patch-flags ,patch-flags
                     #:phases ,phases

@@ 27,6 27,7 @@
   #:use-module (ice-9 match)
   #:export (gnu-build
             gnu-build-system
+            standard-search-paths
             standard-inputs
             package-with-explicit-inputs
             package-with-extra-configure-variable


@@ 143,6 144,16 @@ standard packages used as implicit inputs of the GNU build system."
   (let ((distro (resolve-module '(gnu packages base))))
     (module-ref distro '%final-inputs)))
 
+(define (standard-search-paths)
+  "Return the list of <search-path-specification> for the standard (implicit)
+inputs."
+  (append-map (match-lambda
+               ((_ (? package? p) _ ...)
+                (package-native-search-paths p))
+               (_
+                '()))
+              (standard-packages)))
+
 (define standard-inputs
   (memoize
    (lambda (system)


@@ 204,12 215,7 @@ which could lead to gratuitous input divergence."
 
   (define implicit-search-paths
     (if implicit-inputs?
-        (append-map (match-lambda
-                     ((_ (? package? p) _ ...)
-                      (package-native-search-paths p))
-                     (_
-                      '()))
-                    (standard-packages))
+        (standard-search-paths)
         '()))
 
   (define builder

@@ 55,7 55,8 @@
   "Build SOURCE using PERL, and with INPUTS.  This assumes that SOURCE
 provides a `Makefile.PL' file as its build system."
   (define perl-search-paths
-    (package-native-search-paths perl))
+    (append (package-native-search-paths perl)
+            (standard-search-paths)))
 
   (define builder
     `(begin