From 8b3dc667710db01b362e1cc449a707151465d6eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 4 Jul 2019 20:13:13 +0200 Subject: gnu: icecat: Fix FTBFS with GCC7. * gnu/packages/gnuzilla.scm (icecat)[arguments]: In the 'augment-CPATH' phase, do not attempt to read CPLUS_INCLUDE_PATH, which is no longer set. --- gnu/packages/gnuzilla.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a874878fea..3e556d0b04 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -864,8 +864,7 @@ from forcing GEXP-PROMISE." (let ((gcc (assoc-ref inputs "gcc"))) (setenv "CPLUS_INCLUDE_PATH" (string-append gcc "/include/c++" ":" - gcc "/include/c++/" build ":" - (getenv "CPLUS_INCLUDE_PATH")))) + gcc "/include/c++/" build))) #t)) (replace 'configure ;; configure does not work followed by both "SHELL=..." and -- cgit 1.4.1 From 68668e97dca8a0b987952d474beeed08ecfb8fda Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 2 Sep 2019 15:32:06 -0400 Subject: gnu: icecat: Update to 60.9.0-guix1. * gnu/packages/gnuzilla.scm (%icecat-version): Update to 60.9.0-guix1. (icecat-source)[upstream-firefox-source]: Update hash. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ff382b2388..0ffeb44d7a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -426,7 +426,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "60.8.0-guix1") +(define %icecat-version "60.9.0-guix1") ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -448,7 +448,7 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1gkz90clarbhgfxhq91s0is6lw6bfymyjb0xbyyswdg68kcqfcy1")))) + "0gy5x2rnnbkqmjd9sq93s3q5na9nkba68xwpizild7k6qn63qicz")))) (upstream-icecat-base-version "60.7.0") ; maybe older than base-version (upstream-icecat-gnu-version "1") -- cgit 1.4.1