freerdpUnstable: 1.1 -> 1.2-beta1

1 files changed, 22 insertions, 57 deletions

diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
index a8388b4829af..0d36f6237392 100644
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -1,77 +1,42 @@
-{ stdenv
-, fetchgit
-, cmake
-, openssl
-, printerSupport ? true, cups
-, pkgconfig
-, zlib
-, libX11
-, libXcursor
-, libXdamage
-, libXext
-, alsaLib
-, ffmpeg
-, libxkbfile
-#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
-, libXinerama
-#, directfb
-#, cunit
-, libXv
-, pulseaudioSupport ? true, pulseaudio
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor
+, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
+, pulseaudio ? null, cups ? null, pcsclite ? null
 }:
 
-assert printerSupport -> cups != null;
-
-let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in
-
 stdenv.mkDerivation rec {
-  name = "freerdp-1.1pre-${stdenv.lib.strings.substring 0 7 rev}";
+  name = "freerdp-1.2.0-beta1";
 
-  src = fetchgit {
-    url = git://github.com/FreeRDP/FreeRDP.git;
-    inherit rev;
-    sha256 = "4e5af9a6769c4b34c6b75dffe83a385d1d86068c523ea9f62fabc651a2958455";
+  src = fetchFromGitHub {
+    owner = "FreeRDP";
+    repo = "FreeRDP";
+    rev = "1.2.0-beta1+android7";
+    sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0";
   };
 
   buildInputs = [
-    cmake
-    openssl
-    pkgconfig
-    zlib
-    libX11
-    libXcursor
-    libXdamage
-    libXext
-#    directfb
-#    cunit
-    alsaLib
-    ffmpeg
-    libxkbfile
-#    xmlto docbook_xml_dtd_412 docbook_xml_xslt
-    libXinerama
-    libXv
-  ] ++ stdenv.lib.optional printerSupport cups;
+    cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib
+    alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite
+  ];
 
   doCheck = false;
 
-  checkPhase = ''LD_LIBRARY_PATH="libfreerdp-cache:libfreerdp-chanman:libfreerdp-common:libfreerdp-core:libfreerdp-gdi:libfreerdp-kbd:libfreerdp-rail:libfreerdp-rfx:libfreerdp-utils" cunit/test_freerdp'';
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DWITH_CUNIT=OFF"
+  ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON"
+    ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON"
+    ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON";
 
-  cmakeFlags = [ "-DWITH_DIRECTFB=OFF" "-DWITH_CUNIT=OFF" "-DWITH_MANPAGES=OFF" 
-  ] ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON";
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Remote Desktop Protocol Client";
-
     longDescription = ''
       FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
       following the Microsoft Open Specifications.
     '';
-
     homepage = http://www.freerdp.com/;
-
-    license = "free-non-copyleft";
-
-    broken = true;  # fails to build
+    license = licenses.apache2;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.unix;
   };
 }