build-system/{perl,cmake}: Keep the standard search paths of gnu-build-system.
Reported by Andreas Enge <andreas@enge.fr>. * guix/build-system/gnu.scm (standard-search-paths): New procedure. (gnu-build): Use it. * guix/build-system/perl.scm (perl-build): Append (standard-search-paths) to the search paths of PERL. * guix/build-system/cmake.scm (cmake-build): Append (standard-search-paths) to SEARCH-PATHS.master
parent
50efa79774
commit
35ac56b63e
|
@ -72,7 +72,8 @@ provides a 'CMakeLists.txt' file as its build system."
|
||||||
#:outputs %outputs
|
#:outputs %outputs
|
||||||
#:inputs %build-inputs
|
#:inputs %build-inputs
|
||||||
#:search-paths ',(map search-path-specification->sexp
|
#:search-paths ',(map search-path-specification->sexp
|
||||||
search-paths)
|
(append search-paths
|
||||||
|
(standard-search-paths)))
|
||||||
#:patches ,patches
|
#:patches ,patches
|
||||||
#:patch-flags ,patch-flags
|
#:patch-flags ,patch-flags
|
||||||
#:phases ,phases
|
#:phases ,phases
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#:use-module (ice-9 match)
|
#:use-module (ice-9 match)
|
||||||
#:export (gnu-build
|
#:export (gnu-build
|
||||||
gnu-build-system
|
gnu-build-system
|
||||||
|
standard-search-paths
|
||||||
standard-inputs
|
standard-inputs
|
||||||
package-with-explicit-inputs
|
package-with-explicit-inputs
|
||||||
package-with-extra-configure-variable
|
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))))
|
(let ((distro (resolve-module '(gnu packages base))))
|
||||||
(module-ref distro '%final-inputs)))
|
(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
|
(define standard-inputs
|
||||||
(memoize
|
(memoize
|
||||||
(lambda (system)
|
(lambda (system)
|
||||||
|
@ -204,12 +215,7 @@ which could lead to gratuitous input divergence."
|
||||||
|
|
||||||
(define implicit-search-paths
|
(define implicit-search-paths
|
||||||
(if implicit-inputs?
|
(if implicit-inputs?
|
||||||
(append-map (match-lambda
|
(standard-search-paths)
|
||||||
((_ (? package? p) _ ...)
|
|
||||||
(package-native-search-paths p))
|
|
||||||
(_
|
|
||||||
'()))
|
|
||||||
(standard-packages))
|
|
||||||
'()))
|
'()))
|
||||||
|
|
||||||
(define builder
|
(define builder
|
||||||
|
|
|
@ -55,7 +55,8 @@
|
||||||
"Build SOURCE using PERL, and with INPUTS. This assumes that SOURCE
|
"Build SOURCE using PERL, and with INPUTS. This assumes that SOURCE
|
||||||
provides a `Makefile.PL' file as its build system."
|
provides a `Makefile.PL' file as its build system."
|
||||||
(define perl-search-paths
|
(define perl-search-paths
|
||||||
(package-native-search-paths perl))
|
(append (package-native-search-paths perl)
|
||||||
|
(standard-search-paths)))
|
||||||
|
|
||||||
(define builder
|
(define builder
|
||||||
`(begin
|
`(begin
|
||||||
|
|
Loading…
Reference in New Issue