diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-20 13:37:58 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-20 13:37:58 +0200 |
| commit | 2817ac3c18c1b1a6291c052bc61edd0947890a82 (patch) | |
| tree | 9985705b35274ae1d6655be789346a98beff63de /gnu/packages/mpd.scm | |
| parent | ecd13016517f0113016fef090782b725fd5e80ce (diff) | |
| parent | 3e12df7d71547b4eca718b6b0e1fc244722dcc39 (diff) | |
| download | guix-2817ac3c18c1b1a6291c052bc61edd0947890a82.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/mpd.scm')
| -rw-r--r-- | gnu/packages/mpd.scm | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 5c82bf9ba1..c024152dda 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -33,6 +33,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages avahi) #:use-module (gnu packages boost) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -185,7 +186,7 @@ player daemon.") (define-public ncmpc (package (name "ncmpc") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) (uri @@ -194,12 +195,23 @@ player daemon.") "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "04jzv1hfdvgbn391523jb2h3yhq9a40pjrg41sl3wf3jf6vajs7g")))) + "18qj3cgqczgfk334x0ywxwa1ckrk9fbjyp34n4zzcxwaifshrzp3")))) (build-system meson-build-system) (arguments `(#:configure-flags - (list "-Dcurses=ncurses"))) - (inputs `(("glib" ,glib) + (list "-Dcurses=ncurses") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'expand-C++-include-path + ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((path "CPLUS_INCLUDE_PATH") + (gcc (assoc-ref inputs "gcc")) + (c++ (string-append gcc "/include/c++"))) + (setenv path (string-append c++ ":" (getenv path))) + #t)))))) + (inputs `(("gcc", gcc-8) ; for its C++14 support + ("glib" ,glib) ("libmpdclient" ,libmpdclient) ("ncurses" ,ncurses))) (native-inputs `(("gettext" ,gettext-minimal) ; for xgettext |