Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2018-03-18 01:09:25 +01:00
commit 7ace97395f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
147 changed files with 4608 additions and 1315 deletions

View file

@ -90,7 +90,7 @@ makes a few sacrifices to acquire fast full and incremental build times.")
;; Meson calls the various executables in out/bin through the
;; Python interpreter, so we cannot use the shell wrapper.
(delete 'wrap))))
(inputs `(("ninja", ninja)))
(inputs `(("ninja" ,ninja)))
(propagated-inputs `(("python" ,python)))
(home-page "https://mesonbuild.com/")
(synopsis "Build system designed to be fast and user-friendly")