diff options
author | David Guibert <david.guibert@gmail.com> | 2012-12-14 17:12:17 +0100 |
---|---|---|
committer | David Guibert <david.guibert@gmail.com> | 2012-12-18 09:57:07 +0100 |
commit | 7503291ff99dab60e7d2bed89b1927f7b91b6238 (patch) | |
tree | c98f16c6d3a66bb8b03cbee980119453a7cfb9c5 /pkgs/applications/networking/remote | |
parent | 9247552a918e81ff2ab878b835a9e556950da9da (diff) |
update freerdp to 1.0.1 and unstable version.
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r-- | pkgs/applications/networking/remote/freerdp/default.nix | 22 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/freerdp/unstable.nix | 36 |
2 files changed, 40 insertions, 18 deletions
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 434d75bce585c..d8634e31dada5 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -10,16 +10,22 @@ , libXdamage , libXext , alsaLib +, ffmpeg +, libxkbfile +#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt +, libXinerama +, libXv +, pulseaudioSupport ? true, pulseaudio }: assert printerSupport -> cups != null; stdenv.mkDerivation rec { name = "freerdp-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${version}.tar.gz"; - sha256 = "df9f5f3275436f3e413824ca40f1e41733a95121f45e1ed41ab410701c5764cc"; + url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"; + sha256 = "1my8gamvfrn6v9gcqxsa9cgxr42shc0l826zvxj8wpcay6gd321w"; }; buildInputs = [ @@ -32,11 +38,17 @@ stdenv.mkDerivation rec { libXdamage libXext alsaLib + ffmpeg + libxkbfile +# xmlto docbook_xml_dtd_412 docbook_xml_xslt + libXinerama + libXv ] ++ stdenv.lib.optional printerSupport cups; configureFlags = [ - "--with-x" - ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"; + "--with-x" "-DWITH_MANPAGES=OFF" + ] ++ stdenv.lib.optional printerSupport "--with-printer=cups" + ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; meta = { description = "A Remote Desktop Protocol Client"; diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 2266f7237f617..ef8ddf8b0e3ba 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,53 +1,63 @@ { stdenv , fetchgit +, cmake , openssl , printerSupport ? true, cups , pkgconfig , zlib , libX11 , libXcursor +, libXdamage +, libXext , alsaLib -, cmake +, ffmpeg , libxkbfile +#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt , libXinerama -, libXext -, directfb -, cunit +#, directfb +#, cunit +, libXv +, pulseaudioSupport ? true, pulseaudio }: assert printerSupport -> cups != null; -let rev = "498b88a1da748a4a2b4dbd12c795ca87fee24bab"; in +let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in stdenv.mkDerivation rec { - name = "freerdp-1.0pre${rev}"; + name = "freerdp-1.1pre${rev}"; src = fetchgit { url = git://github.com/FreeRDP/FreeRDP.git; inherit rev; - sha256 = "91ef562e96db483ada28236e524326a75b6942becce4fd2a65ace386186eccf7"; + sha256 = "4e5af9a6769c4b34c6b75dffe83a385d1d86068c523ea9f62fabc651a2958455"; }; buildInputs = [ + cmake openssl pkgconfig zlib libX11 libXcursor - libxkbfile - libXinerama + libXdamage libXext - directfb +# directfb +# cunit alsaLib - cmake - cunit + ffmpeg + libxkbfile +# xmlto docbook_xml_dtd_412 docbook_xml_xslt + libXinerama + libXv ] ++ stdenv.lib.optional printerSupport cups; 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 = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ]; + cmakeFlags = [ "-DWITH_DIRECTFB=OFF" "-DWITH_CUNIT=OFF" "-DWITH_MANPAGES=OFF" + ] ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; meta = { description = "A Remote Desktop Protocol Client"; |