Merge branch 'staging' into core-updates

This commit is contained in:
Marius Bakke 2019-03-14 16:30:19 +01:00
commit 19008a22d1
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
91 changed files with 12282 additions and 7670 deletions

View file

@ -1333,7 +1333,6 @@ play them on systems for which they were never designed!")
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("pugixml" ,pugixml)
("python-sphinx" ,python-sphinx)
("texinfo" ,texinfo)))
(inputs
@ -1348,6 +1347,7 @@ play them on systems for which they were never designed!")
("lua" ,lua)
("portaudio" ,portaudio)
("portmidi" ,portmidi)
("pugixml" ,pugixml)
("python-wrapper" ,python-wrapper)
("qtbase" ,qtbase)
("rapidjson" ,rapidjson)