TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: waybar: Remove GCC input.

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

14
gnu/packages/wm.scm
View file

@ -89,7 +89,6 @@ (define-module (gnu packages wm)
#:use-module (gnu packages pretty-print) #:use-module (gnu packages pretty-print)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages commencement) ; TODO remove when default gcc version >=7
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)) #:use-module (guix git-download))
@ -1337,15 +1336,7 @@ (define-public waybar
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "-Dout=" (assoc-ref %outputs "out"))) (list (string-append "-Dout=" (assoc-ref %outputs "out")))))
#:phases
(modify-phases %standard-phases
;; TODO remove when issue #30756 is resolved
(add-before 'configure 'fix-gcc
(lambda _
(unsetenv "C_INCLUDE_PATH")
(unsetenv "CPLUS_INCLUDE_PATH")
#t)))))
(inputs `(("fmt" ,fmt) (inputs `(("fmt" ,fmt)
("gtkmm" ,gtkmm) ("gtkmm" ,gtkmm)
("jsoncpp" ,jsoncpp) ("jsoncpp" ,jsoncpp)
@ -1356,8 +1347,7 @@ (define-public waybar
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("spdlog" ,spdlog) ("spdlog" ,spdlog)
("wayland" ,wayland))) ("wayland" ,wayland)))
(native-inputs `(("gcc-toolchain" ,gcc-toolchain-7) ; TODO remove when default gcc version >=7 (native-inputs `(("glib:bin" ,glib "bin")
("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("wayland-protocols" ,wayland-protocols))) ("wayland-protocols" ,wayland-protocols)))
(home-page "https://github.com/Alexays/Waybar") (home-page "https://github.com/Alexays/Waybar")