diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-24 19:37:03 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-24 19:37:03 +0100 |
| commit | 3941af527df6f27c88258c5d3b78720a07fe60ef (patch) | |
| tree | 4747f74f32faef8a4f20bf7adf797ce57a8324fc /gnu/packages/qt.scm | |
| parent | d85f8e46dbc5a978fe7359c89cbb3167fb9c2029 (diff) | |
| parent | 7daae3c9d09a4d27586824a1d1af99e7af454d26 (diff) | |
| download | guix-3941af527df6f27c88258c5d3b78720a07fe60ef.tar guix-3941af527df6f27c88258c5d3b78720a07fe60ef.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 466c6ba358..7aa9d0f0f9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -598,6 +598,19 @@ developers using C++ or QML, a CSS & JavaScript like language.") developers using C++ or QML, a CSS & JavaScript like language.") (license (list license:lgpl2.1 license:lgpl3)))) +;; This variant fixes a problem with the CMake macros shipped by qtbase. See +;; discussion at <https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00308.html>. +(define-public qtbase-patched + (let ((src (package-source qtbase))) + (hidden-package + (package + (inherit qtbase) + (source + (origin + (inherit src) + (patches + (append (search-patches "qtbase-QTBUG-81715.patch") + (origin-patches src))))))))) ;; qt used to refer to the monolithic Qt 5.x package (define-deprecated qt qtbase) |