From e6e09dc9c53df38e48be331a5f930ef6d52454f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 20:09:51 +0200 Subject: [PATCH] gnu: sooperlooper: Adjust for GCC 7. * gnu/packages/music.scm (sooperlooper)[arguments]: Remove <#:make-flags>. Preserve CPATH in <#:phases>. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a2c2e01661..9119817056 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2942,8 +2942,7 @@ with a number of bugfixes and changes to improve IT playback.") (patches (search-patches "sooperlooper-build-with-wx-30.patch")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CXXFLAGS=-std=gnu++11") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'add-sigc++-includes (lambda* (#:key inputs #:allow-other-keys) @@ -2955,7 +2954,8 @@ with a number of bugfixes and changes to improve IT playback.") sig "/lib/sigc++-2.0/include:" xml "/include/libxml2/:" cwd "/libs/pbd:" - cwd "/libs/midi++"))) + cwd "/libs/midi++:" + (or (getenv "CPATH") "")))) (substitute* '("src/control_osc.hpp" "src/gui/app_frame.hpp" "src/gui/config_panel.hpp"