Merge branch 'freerdp2' of git://github.com/peterhoeg/nixpkgs

This commit is contained in:
Shea Levy 2016-09-13 07:45:05 -04:00
commit 49ba0b7896

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor
, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , libXdamage, libXext, libXrender, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
, substituteAll , substituteAll
, libpulseaudio ? null, cups ? null, pcsclite ? null , libpulseaudio ? null, cups ? null, pcsclite ? null
, buildServer ? true, optimize ? true , buildServer ? true, optimize ? true
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
}); });
buildInputs = [ buildInputs = [
cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext libXrender glib
alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite
]; ];
@ -51,4 +51,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }