public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freerdp: 2.0.0-rc4 -> 2.0.0 (#84885)

Browse Source 
* freerdp: 2.0.0-rc4 -> 2.0.0

* freerdp: add Xtst for input in shadow server, libxslt for manpages

* freerdp: nits
This commit is contained in:
Linus Heckemann 2020-04-11 05:03:03 +02:00 committed by GitHub
parent 15d5a2adc1
commit 156ee198b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -1,9 +1,11 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig { stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, ffmpeg, glib, openssl, pcre, zlib , alsaLib, ffmpeg, glib, openssl, pcre, zlib
, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv , libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv, libXtst
, libxkbcommon, libxkbfile , libxkbcommon, libxkbfile
, wayland , wayland
, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc , gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc
, libxslt
, libusb1
, libpulseaudio ? null , libpulseaudio ? null
, cups ? null , cups ? null
, pcsclite ? null , pcsclite ? null
@ -14,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "freerdp"; pname = "freerdp";
version = "2.0.0-rc4"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FreeRDP"; owner = "FreeRDP";
repo = "FreeRDP"; repo = "FreeRDP";
rev = version; rev = version;
sha256 = "0546i0m2d4nz5jh84ngwzpcm3c43fp987jk6cynqspsmvapab6da"; sha256 = "0d2559v0z1jnq6jlrvsgdf8p6gd27m8kwdnxckl1x0ygaxs50bqc";
}; };
# outputs = [ "bin" "out" "dev" ]; # outputs = [ "bin" "out" "dev" ];
@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
--replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
'' + lib.optionalString (pcsclite != null) '' '' + lib.optionalString (pcsclite != null) ''
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
--replace "libpcsclite.so" "${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so" --replace "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
'' + lib.optionalString nocaps '' '' + lib.optionalString nocaps ''
substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \ substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
--replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL" --replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
@ -40,9 +42,10 @@ stdenv.mkDerivation rec {
buildInputs = with lib; [ buildInputs = with lib; [
alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib
gstreamer gst-plugins-base gst-plugins-good libunwind orc gstreamer gst-plugins-base gst-plugins-good libunwind orc
libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libXtst
libxkbcommon libxkbfile libxkbcommon libxkbfile
wayland wayland libusb1
libxslt
] ++ optional stdenv.isLinux systemd; ] ++ optional stdenv.isLinux systemd;
nativeBuildInputs = [ nativeBuildInputs = [
@ -71,7 +74,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "http://www.freerdp.com/"; homepage = "http://www.freerdp.com/";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg lheckemann ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }