about summary refs log tree commit diff
path: root/pkgs/applications/networking/remote
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2014-10-23 09:46:52 +0200
committerLluís Batlle i Rossell <viric@viric.name>2014-10-23 09:46:52 +0200
commit8997cac7859b29c6a80228561949d911ef8ca150 (patch)
tree0fc0ebe9789102077f4c66563fc749dd49002819 /pkgs/applications/networking/remote
parent3bd29ef68f2d858d89f76997d7b67e2c497bd8f2 (diff)
downloadnixlib-8997cac7859b29c6a80228561949d911ef8ca150.tar
nixlib-8997cac7859b29c6a80228561949d911ef8ca150.tar.gz
nixlib-8997cac7859b29c6a80228561949d911ef8ca150.tar.bz2
nixlib-8997cac7859b29c6a80228561949d911ef8ca150.tar.lz
nixlib-8997cac7859b29c6a80228561949d911ef8ca150.tar.xz
nixlib-8997cac7859b29c6a80228561949d911ef8ca150.tar.zst
nixlib-8997cac7859b29c6a80228561949d911ef8ca150.zip
Adding a patch that brings the windows key to rdesktop
Taken from upstream, will be on next release.
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r--pkgs/applications/networking/remote/rdesktop/default.nix2
-rw-r--r--pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch29
2 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index 7d2b7990d3f9..fbbc85108a15 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation (rec {
     sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv";
   };
 
+  patches = [ ./enable_windows_key.patch ];
+
   buildInputs = [openssl libX11];
 
   configureFlags = [
diff --git a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch
new file mode 100644
index 000000000000..fff84c599636
--- /dev/null
+++ b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch
@@ -0,0 +1,29 @@
+http://sourceforge.net/p/rdesktop/code/1816/
+Fix constant naming and enabled windowskey by default.
+
+Index: trunk/rdesktop.c
+===================================================================
+--- trunk/rdesktop.c	(revision 1815)
++++ trunk/rdesktop.c	(revision 1816)
+@@ -554,7 +554,7 @@
+ 	act.sa_flags = 0;
+ 	sigaction(SIGPIPE, &act, NULL);
+ 
+-	flags = RDP_LOGON_NORMAL;
++	flags = RDP_LOGON_NORMAL | RDP_LOGON_ENABLEWINDOWSKEY;
+ 	prompt_password = False;
+ 	g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0;
+ 	g_embed_wnd = 0;
+Index: trunk/constants.h
+===================================================================
+--- trunk/constants.h	(revision 1815)
++++ trunk/constants.h	(revision 1816)
+@@ -321,7 +321,7 @@
+ #define RDP_LOGON_AUTO		0x0008
+ #define RDP_LOGON_NORMAL	0x0033
+ #define RDP_LOGON_COMPRESSION	0x0080	/* mppc compression with 8kB histroy buffer */
+-#define RDP_LOGON_BLOB		0x0100
++#define RDP_LOGON_ENABLEWINDOWSKEY 0x0100
+ #define RDP_LOGON_COMPRESSION2	0x0200	/* rdp5 mppc compression with 64kB history buffer */
+ #define RDP_LOGON_LEAVE_AUDIO	0x2000
+ #define RDP_LOGON_PASSWORD_IS_SC_PIN 0x40000