nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: nghttp2: Remove GCC7 workaround. 

* gnu/packages/web.scm (nghttp2)[native-inputs]: Remove GCC-7.
[arguments]: Remove phase 'work-around-bug-30756'.
This commit is contained in:
Marius Bakke 2019-02-10 18:12:53 +01:00
parent 2bdf9cb38c
commit c3188c9acc
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/web.scm
View File

@ -6255,7 +6255,6 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
"lib")) ; only libnghttp2 "lib")) ; only libnghttp2
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("gcc" ,gcc-7) ; 1.35.0 requires GCC6 or later
;; Required by tests. ;; Required by tests.
("cunit" ,cunit) ("cunit" ,cunit)
@ -6287,9 +6286,6 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
(("@prefix@") (("@prefix@")
(assoc-ref outputs "lib"))) (assoc-ref outputs "lib")))
#t)) #t))
(add-before 'configure 'work-around-bug-30756
(lambda _
(for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t))
(add-before 'check 'set-timezone-directory (add-before 'check 'set-timezone-directory
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata")