ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xen: Fix build failure.

Browse source 
* gnu/packages/virtualization.scm (xen)[arguments]<#:phases>[set-environment-up]:
Use CPATH instead of C_INCLUDE_PATH, CPLUS_INCLUDE_PATH.
This commit is contained in:
Danny Milosavljevic 2020-04-14 12:02:34 +02:00
parent acaeaa0a29
commit 6177320d78
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/virtualization.scm
View file

@ -1290,14 +1290,13 @@ (define (filter-environment! filter-predicate
new-search-path ":"))) new-search-path ":")))
(setenv env-name new-env-value))) (setenv env-name new-env-value)))
environment-variable-names)) environment-variable-names))
(setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) (setenv "CROSS_CPATH" (getenv "CPATH"))
(setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH"))
(setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
(filter-environment! cross? (filter-environment! cross?
'("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" '("CROSS_CPATH"
"CROSS_LIBRARY_PATH")) "CROSS_LIBRARY_PATH"))
(filter-environment! (lambda (e) (not (cross? e))) (filter-environment! (lambda (e) (not (cross? e)))
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" '("CPATH"
"LIBRARY_PATH")) "LIBRARY_PATH"))
;; Guix tries to be helpful and automatically adds ;; Guix tries to be helpful and automatically adds
;; mini-os-git-checkout/include to the include path, ;; mini-os-git-checkout/include to the include path,
@ -1306,7 +1305,7 @@ (define (filter-environment! filter-predicate
(not (not
(string-contains e (string-contains e
"mini-os-git-checkout"))) "mini-os-git-checkout")))
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" '("CPATH"
"LIBRARY_PATH")) "LIBRARY_PATH"))
(setenv "EFI_VENDOR" "guix") (setenv "EFI_VENDOR" "guix")
#t)) #t))