diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/sync.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/sync.scm')
| -rw-r--r-- | gnu/packages/sync.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 2b64117dc6..c85b4f801c 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -192,7 +192,7 @@ ("libzip" ,libzip) ("openssl" ,openssl) ("python-nautilus" ,python-nautilus) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtkeychain" ,qtkeychain) @@ -352,7 +352,7 @@ See also: megacmd, the official tool set by MEGA.") ("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("sqlite" ,sqlite) ("zlib" ,zlib))) @@ -397,7 +397,7 @@ silently and reliably flow across to every other.") #t)))) #:tests? #f)) ; no test target (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtwebkit" ,qtwebkit))) (home-page "https://github.com/sieren/QSyncthingTray") (synopsis "Traybar Application for Syncthing") |