tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
freerdp: Use absolute path when calling dlopen
Michael Alyn Miller
11 years ago
1751ee35
24b5eb61
+33
2 changed files
expand all
collapse all
unified
split
pkgs
applications
networking
remote
freerdp
dlopen-absolute-paths.diff
unstable.nix
+25
pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff
···
1
1
+
*** FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c.orig 2015-01-25 19:10:03.971628580 -0800
2
2
+
--- FreeRDP-1.2.0-beta1+android7-src/winpr/libwinpr/smartcard/smartcard_pcsc.c 2015-01-25 19:55:05.453980544 -0800
3
3
+
***************
4
4
+
*** 2807,2816 ****
5
5
+
#ifdef __MACOSX__
6
6
+
g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
7
7
+
#else
8
8
+
! g_PCSCModule = LoadLibraryA("libpcsclite.so.1");
9
9
+
10
10
+
if (!g_PCSCModule)
11
11
+
! g_PCSCModule = LoadLibraryA("libpcsclite.so");
12
12
+
#endif
13
13
+
14
14
+
if (!g_PCSCModule)
15
15
+
--- 2807,2816 ----
16
16
+
#ifdef __MACOSX__
17
17
+
g_PCSCModule = LoadLibraryA("/System/Library/Frameworks/PCSC.framework/PCSC");
18
18
+
#else
19
19
+
! g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so.1");
20
20
+
21
21
+
if (!g_PCSCModule)
22
22
+
! g_PCSCModule = LoadLibraryA("@pcsclite@/lib/libpcsclite.so");
23
23
+
#endif
24
24
+
25
25
+
if (!g_PCSCModule)
+8
pkgs/applications/networking/remote/freerdp/unstable.nix
···
1
1
{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor
2
2
, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
3
3
+
, substituteAll
3
4
, pulseaudio ? null, cups ? null, pcsclite ? null
4
5
}:
5
6
···
12
13
rev = "1.2.0-beta1+android7";
13
14
sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0";
14
15
};
16
16
+
17
17
+
patches = [
18
18
+
] ++ stdenv.lib.optional (pcsclite != null)
19
19
+
(substituteAll {
20
20
+
src = ./dlopen-absolute-paths.diff;
21
21
+
inherit pcsclite;
22
22
+
});
15
23
16
24
buildInputs = [
17
25
cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib