diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 10:20:32 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 10:20:32 -0400 |
| commit | 3d297a0017210f1dd135592efb10846840a8af88 (patch) | |
| tree | 8868c35a558a6288b5097d65bee42dda291178e4 /gnu/packages/qt.scm | |
| parent | 279349209e44aaae6ca2aba328fe2a4d2da99f12 (diff) | |
| parent | 6737d8d3248301e65bc24291b1a776e4aa8c3648 (diff) | |
| download | guix-3d297a0017210f1dd135592efb10846840a8af88.tar guix-3d297a0017210f1dd135592efb10846840a8af88.tar.gz | |
Merge branch 'master' into staging
With resolved conflicts in:
gnu/local.mk
gnu/packages/freedesktop.scm
gnu/packages/gnuzilla.scm
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a1ef352263..541e1e6c06 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1381,7 +1381,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (description "The @code{qtshadertools} module provides APIs and tools supporting shader pipeline functionality as offered in Qt Quick to operate on Vulkan, OpenGL and other main graphic APIs.") - (license (package-home-page qtbase)))) + (license (package-license qtbase)))) (define-public qtmultimedia (package @@ -4233,3 +4233,9 @@ and import their menus over DBus.") services using the XML based SOAP protocol and without the need for a dedicated web server.") (license (list license:gpl2 license:gpl3)))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; |