public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update freerdp to 1.0.1 and unstable version.

Browse Source
This commit is contained in:
David Guibert 2012-12-14 17:12:17 +01:00
parent 9247552a91
commit 7503291ff9
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -10,16 +10,22 @@
, libXdamage , libXdamage
, libXext , libXext
, alsaLib , alsaLib
, ffmpeg
, libxkbfile
#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
, libXinerama
, libXv
, pulseaudioSupport ? true, pulseaudio
}: }:
assert printerSupport -> cups != null; assert printerSupport -> cups != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freerdp-${version}"; name = "freerdp-${version}";
version = "1.0.0"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${version}.tar.gz"; url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
sha256 = "df9f5f3275436f3e413824ca40f1e41733a95121f45e1ed41ab410701c5764cc"; sha256 = "1my8gamvfrn6v9gcqxsa9cgxr42shc0l826zvxj8wpcay6gd321w";
}; };
buildInputs = [ buildInputs = [
@ -32,11 +38,17 @@ stdenv.mkDerivation rec {
libXdamage libXdamage
libXext libXext
alsaLib alsaLib
ffmpeg
libxkbfile
# xmlto docbook_xml_dtd_412 docbook_xml_xslt
libXinerama
libXv
] ++ stdenv.lib.optional printerSupport cups; ] ++ stdenv.lib.optional printerSupport cups;
configureFlags = [ configureFlags = [
"--with-x" "--with-x" "-DWITH_MANPAGES=OFF"
] ++ stdenv.lib.optional printerSupport "--with-printer=cups"; ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"
++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON";
meta = { meta = {
description = "A Remote Desktop Protocol Client"; description = "A Remote Desktop Protocol Client";

40
pkgs/applications/networking/remote/freerdp/unstable.nix
View File

@ -1,53 +1,63 @@
{ stdenv { stdenv
, fetchgit , fetchgit
, cmake
, openssl , openssl
, printerSupport ? true, cups , printerSupport ? true, cups
, pkgconfig , pkgconfig
, zlib , zlib
, libX11 , libX11
, libXcursor , libXcursor
, alsaLib , libXdamage
, cmake
, libxkbfile
, libXinerama
, libXext , libXext
, directfb , alsaLib
, cunit , ffmpeg
, libxkbfile
#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
, libXinerama
#, directfb
#, cunit
, libXv
, pulseaudioSupport ? true, pulseaudio
}: }:
assert printerSupport -> cups != null; assert printerSupport -> cups != null;
let rev = "498b88a1da748a4a2b4dbd12c795ca87fee24bab"; in let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freerdp-1.0pre${rev}"; name = "freerdp-1.1pre${rev}";
src = fetchgit { src = fetchgit {
url = git://github.com/FreeRDP/FreeRDP.git; url = git://github.com/FreeRDP/FreeRDP.git;
inherit rev; inherit rev;
sha256 = "91ef562e96db483ada28236e524326a75b6942becce4fd2a65ace386186eccf7"; sha256 = "4e5af9a6769c4b34c6b75dffe83a385d1d86068c523ea9f62fabc651a2958455";
}; };
buildInputs = [ buildInputs = [
cmake
openssl openssl
pkgconfig pkgconfig
zlib zlib
libX11 libX11
libXcursor libXcursor
libxkbfile libXdamage
libXinerama
libXext libXext
directfb # directfb
# cunit
alsaLib alsaLib
cmake ffmpeg
cunit libxkbfile
# xmlto docbook_xml_dtd_412 docbook_xml_xslt
libXinerama
libXv
] ++ stdenv.lib.optional printerSupport cups; ] ++ stdenv.lib.optional printerSupport cups;
doCheck = false; 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''; 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 = { meta = {
description = "A Remote Desktop Protocol Client"; description = "A Remote Desktop Protocol Client";