diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:32:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:34:57 +0100 |
| commit | dbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch) | |
| tree | 18c61fd667b95bf3a3322e5f40161d2028b3e42c /pkgs/applications/networking/remote | |
| parent | 5dab625862a5690a35c122f3749eee31879a2415 (diff) | |
| parent | b50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff) | |
| download | nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.gz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.bz2 nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.lz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.xz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.zst nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.zip | |
Merge branch 'master' into staging
Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/applications/networking/remote')
| -rw-r--r-- | pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff | 25 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/freerdp/unstable.nix | 8 |
2 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff b/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff new file mode 100644 index 000000000000..2037ad6acb9f --- /dev/null +++ b/pkgs/applications/networking/remote/freerdp/dlopen-absolute-paths.diff @@ -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) diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 00e5a4f93ee6..a1528dd1255b 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv +, substituteAll , pulseaudio ? null, cups ? null, pcsclite ? null }: @@ -13,6 +14,13 @@ stdenv.mkDerivation rec { sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; }; + patches = [ + ] ++ stdenv.lib.optional (pcsclite != null) + (substituteAll { + src = ./dlopen-absolute-paths.diff; + inherit pcsclite; + }); + buildInputs = [ cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite |