diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-29 11:35:04 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-29 11:35:04 +0200 |
| commit | 26e92a3025513ec8e2b243cf819a7526a5d8d7c3 (patch) | |
| tree | 8d959ac00ca31a6960e90cdc6c33a1e08889e3fc /gnu/packages/qt.scm | |
| parent | 58f705c18ebfafc4e291ba3be2ceeeead9e2a289 (diff) | |
| download | guix-26e92a3025513ec8e2b243cf819a7526a5d8d7c3.tar guix-26e92a3025513ec8e2b243cf819a7526a5d8d7c3.tar.gz | |
gnu: qtbase: Patch the 'moc' executable to cope with GCCs C++ headers.
* gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtbase)[source](patches): Add it.
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 81989f68c3..368cfb7e15 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -352,6 +352,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-moc-ignore-gcc-macro.patch" "qtbase-QTBUG-81715.patch")) (modules '((guix build utils))) (snippet |