diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-11 19:49:27 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-11 19:49:27 +0100 |
| commit | 63d4ef52ebad4157817d56ccbe974da8fff81929 (patch) | |
| tree | 058d5a4bf953622d89d2d91d2c9054200bbe8cc2 /gnu/packages/mpd.scm | |
| parent | f85ca6eda044c43bd5b9b54e756c02fd90c372f1 (diff) | |
| download | patches-63d4ef52ebad4157817d56ccbe974da8fff81929.tar patches-63d4ef52ebad4157817d56ccbe974da8fff81929.tar.gz | |
gnu: Remove GCC < 7 workarounds.
* gnu/packages/emulators.scm (dolphin-emu)[native-inputs]: Remove GCC-7.
[arguments]: Adjust accordingly.
* gnu/packages/games.scm (openrct2): Likewise.
* gnu/packages/linux.scm (make-linux-libre): Likewise.
* gnu/packages/mpd.scm (mpd): Likewise.
* gnu/packages/storage.scm (ceph): Likewise.
Diffstat (limited to 'gnu/packages/mpd.scm')
| -rw-r--r-- | gnu/packages/mpd.scm | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 7885e21aa4..56ffe177f2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -103,17 +103,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "1ix52vfa8k8my4xyr8b0phg8605b2xchyzyva908m08vpzm14w94")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'... - #: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)))))) + `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) ("avahi" ,avahi) @@ -135,10 +125,7 @@ interfacing MPD in the C, C++ & Objective C languages.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("zlib" ,zlib))) - ;; MPD > 0.21 requires > GCC 6 - (native-inputs `(("gcc" ,gcc-8) - ("gcc-lib" ,gcc-8 "lib") - ("pkg-config" ,pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx))) ;; Missing optional inputs: ;; libyajl |