ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 14:28:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ncmpc: Remove GCC8 input.

Browse source 
* gnu/packages/mpd.scm (ncmpc)[native-inputs]: Remove GCC-8.
[arguments]: Remve <#:phases>.
This commit is contained in:
Marius Bakke 2019-07-02 23:13:06 +02:00
parent 29a4fe8b59
commit 9880bba2c8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/mpd.scm
View file

@ -33,7 +33,6 @@ (define-module (gnu packages mpd)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages avahi) #:use-module (gnu packages avahi)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
@ -198,19 +197,8 @@ (define-public ncmpc
;; Otherwise, they are installed incorrectly, in ;; Otherwise, they are installed incorrectly, in
;; '$out/share/man/man/man1'. ;; '$out/share/man/man/man1'.
(list (string-append "-Dmandir=" (assoc-ref %outputs "out") (list (string-append "-Dmandir=" (assoc-ref %outputs "out")
"/share")) "/share"))))
#:phases (inputs `(("boost" ,boost)
(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
("boost" ,boost)
("pcre" ,pcre) ("pcre" ,pcre)
("libmpdclient" ,libmpdclient) ("libmpdclient" ,libmpdclient)
("ncurses" ,ncurses))) ("ncurses" ,ncurses)))