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

Merge pull request #25463 from volth/freerdp-20170502

Browse Source 
freerdp: 20170201 -> 20170502
This commit is contained in:
Joachim F 2017-05-05 00:12:53 +01:00 committed by GitHub
commit c49b92fe14
2 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, pkgconfig
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib
, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv
, libxkbcommon, libxkbfile
@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
name = "freerdp-git-${version}";
version = "20170201";
version = "20170502";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = "6001cb710dc67eb8811362b7bf383754257a902b";
sha256 = "0l2lwqk2r8rq8a0f91wbb30kqg21fv0k0508djpwj0pa9n73fgmg";
rev = "8569102c3a011602de3a1cdf69f7c69adbb864ee";
sha256 = "0m61aiy8l3ybnk2d2kjmpp9ql31zfs63gjixyj9x95jd4m507j67";
};
# outputs = [ "bin" "out" "dev" ];
@ -29,15 +29,11 @@ stdenv.mkDerivation rec {
export HOME=$TMP
substituteInPlace "libfreerdp/freerdp.pc.in" \
--replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
'' + lib.optionalString (pcsclite != null) ''
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
--replace "libpcsclite.so" "${pcsclite}/lib/libpcsclite.so"
'';
patches = with lib; [
] ++ optional (pcsclite != null)
(substituteAll {
src = ./dlopen-absolute-paths.diff;
inherit pcsclite;
});
buildInputs = with lib; [
alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib
gstreamer gst-plugins-base gst-plugins-good

25
pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
View File

@ -1,25 +0,0 @@
*** FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c.orig 2015-01-25 19:10:03.971628580 -0800
--- FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c 2015-01-25 19:55:05.453980544 -0800
***************
*** 2807,2816 ****
#ifdef __MACOSX__
g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
#else
! g_PCSCModule = LoadLibraryA("libpcsclite.so.1");
if (!g_PCSCModule)
! g_PCSCModule = LoadLibraryA("libpcsclite.so");
#endif
if (!g_PCSCModule)
--- 2807,2816 ----
#ifdef __MACOSX__
g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
#else
! g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so.1");
if (!g_PCSCModule)
! g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so");
#endif
if (!g_PCSCModule)