From c8f2050ab6d192abee199fd0a37b1fdf2ab9c281 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:55:55 +0200 Subject: [PATCH] gnu: gtkmm: Remove GCC5 workaround. * gnu/packages/gtk.scm (gtkmm)[arguments]: Remove <#:configure-flags>. * gnu/packages/gtk.scm (gtkmm-2)[arguments]: Likewise. --- gnu/packages/gtk.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e2e3b4365a..5098019506 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1115,10 +1115,7 @@ toolkit.") ("gtk+" ,gtk+) ("glibmm" ,glibmm))) (arguments - `(;; XXX: Tests require C++14 or later. Remove this when the default - ;; compiler is >= GCC6. - #:configure-flags '("CXXFLAGS=-std=gnu++14") - #:disallowed-references (,xorg-server-for-tests) + `(#:disallowed-references (,xorg-server-for-tests) #:phases (modify-phases %standard-phases (add-before 'check 'run-xvfb (lambda* (#:key inputs #:allow-other-keys) @@ -1154,8 +1151,7 @@ extensive documentation, including API reference and a tutorial.") (sha256 (base32 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) - (arguments - '(#:configure-flags '("CPPFLAGS=-std=c++11"))) ; required by libsigc++ + (arguments '()) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs `(("pangomm" ,pangomm)