Merge pull request #5978 from malyn/fix-freerdp-pcsclite-path

freerdp: Use absolute path when calling dlopen
This commit is contained in:
Domen Kožar 2015-01-26 11:46:05 +01:00
commit da0207b75c
2 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,25 @@
*** 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)

View File

@ -1,5 +1,6 @@
{ 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, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
, substituteAll
, pulseaudio ? null, cups ? null, pcsclite ? null , pulseaudio ? null, cups ? null, pcsclite ? null
}: }:
@ -13,6 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0";
}; };
patches = [
] ++ stdenv.lib.optional (pcsclite != null)
(substituteAll {
src = ./dlopen-absolute-paths.diff;
inherit pcsclite;
});
buildInputs = [ buildInputs = [
cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib
alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite