diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-03-02 16:48:09 +0100 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-03-02 16:48:09 +0100 |
| commit | b9540c5b70df7db86062e3aee96fe6d24bfa7550 (patch) | |
| tree | 31fc1daf3764daea30a093142767b158f24be9fb /pkgs/applications/networking/remote | |
| parent | 95800b2991b9498298cce21098dd32f93efff827 (diff) | |
| download | nixlib-b9540c5b70df7db86062e3aee96fe6d24bfa7550.tar nixlib-b9540c5b70df7db86062e3aee96fe6d24bfa7550.tar.gz nixlib-b9540c5b70df7db86062e3aee96fe6d24bfa7550.tar.bz2 nixlib-b9540c5b70df7db86062e3aee96fe6d24bfa7550.tar.lz nixlib-b9540c5b70df7db86062e3aee96fe6d24bfa7550.tar.xz nixlib-b9540c5b70df7db86062e3aee96fe6d24bfa7550.tar.zst nixlib-b9540c5b70df7db86062e3aee96fe6d24bfa7550.zip | |
rdesktop: update from 1.8.2 to 1.8.3
Diffstat (limited to 'pkgs/applications/networking/remote')
| -rw-r--r-- | pkgs/applications/networking/remote/rdesktop/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch | 29 |
2 files changed, 3 insertions, 34 deletions
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index fbbc85108a15..2e844fdeab4f 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -2,16 +2,14 @@ stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.2"; + version = "1.8.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv"; + sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8"; }; - patches = [ ./enable_windows_key.patch ]; - buildInputs = [openssl libX11]; configureFlags = [ @@ -24,6 +22,6 @@ stdenv.mkDerivation (rec { description = "Open source client for Windows Terminal Services"; homepage = http://www.rdesktop.org/; platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; }) diff --git a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch deleted file mode 100644 index fff84c599636..000000000000 --- a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 |