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/rdesktop.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/rdesktop.scm')
| -rw-r--r-- | gnu/packages/rdesktop.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 30523deefe..adfbe7de06 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -108,7 +108,6 @@ to remotely control a user's Windows desktop.") ("libjpeg" ,libjpeg-turbo) ("libusb" ,libusb) ("libx11" ,libx11) - ("libxkbcommon" ,libxkbcommon) ("libxkbfile" ,libxkbfile) ("libxcursor" ,libxcursor) ("libxext" ,libxext) @@ -118,10 +117,12 @@ to remotely control a user's Windows desktop.") ("libxrender" ,libxrender) ("libxinerama" ,libxinerama) ("libxshmfence" ,libxshmfence) - ("openssl" ,openssl) ("pulseaudio" ,pulseaudio) - ("wayland" ,wayland) ("zlib" ,zlib))) + (propagated-inputs + `(("libxkbcommon" ,libxkbcommon) + ("openssl" ,openssl) + ("wayland" ,wayland))) (arguments `(#:build-type "RELEASE" #:configure-flags |