diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/packages/rdesktop.scm | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
| download | guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.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 |