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

gnu: gtkmm: Remove GCC5 workaround. 

* gnu/packages/gtk.scm (gtkmm)[arguments]: Remove <#:configure-flags>.
* gnu/packages/gtk.scm (gtkmm-2)[arguments]: Likewise.
This commit is contained in:
Marius Bakke 2019-07-02 21:55:55 +02:00
parent 7ce9139f96
commit c8f2050ab6
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/gtk.scm
View File

@ -1115,10 +1115,7 @@ toolkit.")
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("glibmm" ,glibmm))) ("glibmm" ,glibmm)))
(arguments (arguments
`(;; XXX: Tests require C++14 or later. Remove this when the default `(#:disallowed-references (,xorg-server-for-tests)
;; compiler is >= GCC6.
#:configure-flags '("CXXFLAGS=-std=gnu++14")
#:disallowed-references (,xorg-server-for-tests)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'check 'run-xvfb (add-before 'check 'run-xvfb
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -1154,8 +1151,7 @@ extensive documentation, including API reference and a tutorial.")
(sha256 (sha256
(base32 (base32
"0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006"))))
(arguments (arguments '())
'(#:configure-flags '("CPPFLAGS=-std=c++11"))) ; required by libsigc++
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs
`(("pangomm" ,pangomm) `(("pangomm" ,pangomm)