diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-09 00:18:32 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-09 00:18:32 +0100 |
| commit | fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442 (patch) | |
| tree | 5508f13c24ef19dd018cd91fe287e8fa50eda7e4 /gnu/packages/glib.scm | |
| parent | 16735b0b632b5f05fc914836b8f345e3a9e601dd (diff) | |
| parent | cec0c4e29c6efb337ae65d9c533cdbb2bf724430 (diff) | |
| download | guix-patches-fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442.tar guix-patches-fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 0af7c6bf00..61d8e84d54 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -36,7 +36,6 @@ #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) @@ -621,11 +620,7 @@ useful for C++.") (delete-file "tests/test_ossig.py") #t))))) (native-inputs - `(;; Use gcc-7 to work around an internal compiler error that happens - ;; when using gcc-5.5.0. FIXME: Try removing this when the default - ;; compiler is no longer gcc-5.5.0. - ("gcc" ,gcc-7) - ("which" ,which) + `(("which" ,which) ;for tests: dbus-run-session and glib-compile-schemas ("dbus" ,dbus) ("glib-bin" ,glib "bin") @@ -656,11 +651,7 @@ useful for C++.") ("python-pycairo" ,python2-pycairo) ("gobject-introspection" ,gobject-introspection))) (native-inputs - `(;; Use gcc-7 to work around an internal compiler error that happens - ;; when using gcc-5.5.0. FIXME: Try removing this when the default - ;; compiler is no longer gcc-5.5.0. - ("gcc" ,gcc-7) - ("which" ,which) + `(("which" ,which) ;for tests: dbus-run-session and glib-compile-schemas ("dbus" ,dbus) ("glib-bin" ,glib "bin") |