remmina: 1.0.0 -> 1.2.0-rcgit.15

Fixes build post FreeRDP upgrade (5abb36b)

2 files changed, 34 insertions, 30 deletions

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 9bc389961079..90c80db0a02a 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,9 +1,13 @@
-{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper
-, glib, gtk2, gettext, libxkbfile, libgnome_keyring, libX11
-, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
+, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11
+, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
+, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
+, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
+, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core
+, openssl }:
 
 let
-  version = "1.0.0";
+  version = "1.2.0-rcgit.15";
   
   desktopItem = makeDesktopItem {
     name = "remmina";
@@ -15,29 +19,45 @@ let
     categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
   };
 
+  # Latest release of remmina refers to thing that aren't yet in
+  # a FreeRDP release so we need to build one from git source
+  # See also https://github.com/FreeRDP/Remmina/pull/731
+  # Remove when FreeRDP release catches up with this commit
+  freerdp_git = stdenv.lib.overrideDerivation freerdp (args: {
+    name = "freerdp-git-2016-09-30";
+    src = fetchFromGitHub {
+      owner  = "FreeRDP";
+      repo   = "FreeRDP";
+      rev    = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec";
+      sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y";
+    };
+  });
+
 in
 
 stdenv.mkDerivation {
   name = "remmina-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/downloads/FreeRDP/Remmina/Remmina-${version}.tar.gz";
-    sha256 = "7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731";
+  src = fetchFromGitHub {
+    owner  = "FreeRDP";
+    repo   = "Remmina";
+    rev    = "v${version}";
+    sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
   };
 
   buildInputs = [ cmake pkgconfig makeWrapper
-                  glib gtk2 gettext libxkbfile libgnome_keyring libX11
-                  freerdp libssh libgcrypt gnutls ];
-
-  cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF";
+                  glib gtk3 gettext libxkbfile libgnome_keyring libX11
+                  freerdp_git libssh libgcrypt gnutls
+                  pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
+                  libvncserver libpthreadstubs libXdmcp libxkbcommon
+                  libsecret spice_protocol spice_gtk epoxy at_spi2_core
+                  openssl ];
 
-  patches = [ ./lgthread.patch ];
+  cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2";
 
   postInstall = ''
     mkdir -pv $out/share/applications
-    mkdir -pv $out/share/icons
     cp ${desktopItem}/share/applications/* $out/share/applications
-    cp -r $out/share/remmina/icons/* $out/share/icons
     wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
   '';
 
diff --git a/pkgs/applications/networking/remote/remmina/lgthread.patch b/pkgs/applications/networking/remote/remmina/lgthread.patch
deleted file mode 100644
index 2d8e60f75726..000000000000
--- a/pkgs/applications/networking/remote/remmina/lgthread.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix [undefined reference to `g_thread_init'] as suggested by
-http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html
-
-diff -ru FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt FreeRDP-Remmina-356c033/remmina/CMakeLists.txt
---- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt	2013-11-05 12:43:27.660276912 +0400
-+++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt	2013-11-05 12:53:39.607018349 +0400
-@@ -132,6 +132,8 @@
- 	endif()
- endif()
- 
-+set( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -lgthread-2.0" )
-+
- add_subdirectory(po)
- add_subdirectory(icons)
- add_subdirectory(desktop)
-