Browse Source

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.
gn-latest-20200428
Ludovic Courtès 8 years ago
parent
commit
35ac56b63e
3 changed files with 16 additions and 8 deletions
  1. +2
    -1
      guix/build-system/cmake.scm
  2. +12
    -6
      guix/build-system/gnu.scm
  3. +2
    -1
      guix/build-system/perl.scm

+ 2
- 1
guix/build-system/cmake.scm View File

@ -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


+ 12
- 6
guix/build-system/gnu.scm View File

@ -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


+ 2
- 1
guix/build-system/perl.scm View File

@ -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


Loading…
Cancel
Save