amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2018-12-09 00:18:32 +01:00
commit fbb7b04a85
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
84 changed files with 1059 additions and 638 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/glib.scm
View file

@ -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")