alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

freerdp: Use absolute path when calling dlopen

Browse source
This commit is contained in:
Michael Alyn Miller 2015-01-25 20:39:46 -08:00
parent 24b5eb61eb
commit 1751ee35aa
2 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff Normal file
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)

8
pkgs/applications/networking/remote/freerdp/unstable.nix
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