freerdp: Use absolute path when calling dlopen

+33
+25
pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
···
··· 1 + *** FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c.orig 2015-01-25 19:10:03.971628580 -0800 2 + --- FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c 2015-01-25 19:55:05.453980544 -0800 3 + *************** 4 + *** 2807,2816 **** 5 + #ifdef __MACOSX__ 6 + g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC"); 7 + #else 8 + ! g_PCSCModule = LoadLibraryA("libpcsclite.so.1"); 9 + 10 + if (!g_PCSCModule) 11 + ! g_PCSCModule = LoadLibraryA("libpcsclite.so"); 12 + #endif 13 + 14 + if (!g_PCSCModule) 15 + --- 2807,2816 ---- 16 + #ifdef __MACOSX__ 17 + g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC"); 18 + #else 19 + ! g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so.1"); 20 + 21 + if (!g_PCSCModule) 22 + ! g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so"); 23 + #endif 24 + 25 + if (!g_PCSCModule)
+8
pkgs/applications/networking/remote/freerdp/unstable.nix
··· 1 { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor 2 , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv 3 , pulseaudio ? null, cups ? null, pcsclite ? null 4 }: 5 ··· 12 rev = "1.2.0-beta1+android7"; 13 sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; 14 }; 15 16 buildInputs = [ 17 cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib
··· 1 { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor 2 , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv 3 + , substituteAll 4 , pulseaudio ? null, cups ? null, pcsclite ? null 5 }: 6 ··· 13 rev = "1.2.0-beta1+android7"; 14 sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; 15 }; 16 + 17 + patches = [ 18 + ] ++ stdenv.lib.optional (pcsclite != null) 19 + (substituteAll { 20 + src = ./dlopen-absolute-paths.diff; 21 + inherit pcsclite; 22 + }); 23 24 buildInputs = [ 25 cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib