From 6177320d7816f2115bb0f6027cd51c29903fe45e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 14 Apr 2020 12:02:34 +0200 Subject: [PATCH] gnu: xen: Fix build failure. * gnu/packages/virtualization.scm (xen)[arguments]<#:phases>[set-environment-up]: Use CPATH instead of C_INCLUDE_PATH, CPLUS_INCLUDE_PATH. --- gnu/packages/virtualization.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 0fded11f3a..bca3c917b2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1290,14 +1290,13 @@ (define (filter-environment! filter-predicate new-search-path ":"))) (setenv env-name new-env-value))) environment-variable-names)) - (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) - (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) + (setenv "CROSS_CPATH" (getenv "CPATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (filter-environment! cross? - '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" + '("CROSS_CPATH" "CROSS_LIBRARY_PATH")) (filter-environment! (lambda (e) (not (cross? e))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + '("CPATH" "LIBRARY_PATH")) ;; Guix tries to be helpful and automatically adds ;; mini-os-git-checkout/include to the include path, @@ -1306,7 +1305,7 @@ (define (filter-environment! filter-predicate (not (string-contains e "mini-os-git-checkout"))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + '("CPATH" "LIBRARY_PATH")) (setenv "EFI_VENDOR" "guix") #t))