aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/wm.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-02 23:18:07 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-02 23:18:07 +0200
commitb80dd5e3e08b7814db3451363c75f33749f8b797 (patch)
tree3ad76a9ac653f78989b7dc07eb575f78603cb9bb /gnu/packages/wm.scm
parent9880bba2c8ebb30c35e34b5ff4314ece8f759528 (diff)
downloadguix-b80dd5e3e08b7814db3451363c75f33749f8b797.tar
guix-b80dd5e3e08b7814db3451363c75f33749f8b797.tar.gz
gnu: waybar: Remove GCC input.
* gnu/packages/wm.scm (waybar)[native-inputs]: Remove GCC-TOOLCHAIN-7. [arguments]: Remove <#:phases>.
Diffstat (limited to 'gnu/packages/wm.scm')
-rw-r--r--gnu/packages/wm.scm14
1 files changed, 2 insertions, 12 deletions
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 90bc7fc883..1747619a87 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -89,7 +89,6 @@
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages logging)
#:use-module (gnu packages serialization)
- #:use-module (gnu packages commencement) ; TODO remove when default gcc version >=7
#:use-module (guix download)
#:use-module (guix git-download))
@@ -1337,15 +1336,7 @@ modules for building a Wayland compositor.")
(build-system meson-build-system)
(arguments
`(#:configure-flags
- (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)))))
+ (list (string-append "-Dout=" (assoc-ref %outputs "out")))))
(inputs `(("fmt" ,fmt)
("gtkmm" ,gtkmm)
("jsoncpp" ,jsoncpp)
@@ -1356,8 +1347,7 @@ modules for building a Wayland compositor.")
("pulseaudio" ,pulseaudio)
("spdlog" ,spdlog)
("wayland" ,wayland)))
- (native-inputs `(("gcc-toolchain" ,gcc-toolchain-7) ; TODO remove when default gcc version >=7
- ("glib:bin" ,glib "bin")
+ (native-inputs `(("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)
("wayland-protocols" ,wayland-protocols)))
(home-page "https://github.com/Alexays/Waybar")