diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-09-26 12:53:19 -0400 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-24 01:17:03 +0200 |
| commit | 13dfd7464e8d88b1d058b00a99cdb473efdd667b (patch) | |
| tree | f4dff4b28271daff9f48eb9ae2872c43cdc1c650 /pkgs/applications/networking/remote/freerdp/default.nix | |
| parent | af2465acb9d82134fc0a9eb27eacee2e321e4035 (diff) | |
| download | nixpkgs-13dfd7464e8d88b1d058b00a99cdb473efdd667b.tar nixpkgs-13dfd7464e8d88b1d058b00a99cdb473efdd667b.tar.gz nixpkgs-13dfd7464e8d88b1d058b00a99cdb473efdd667b.tar.bz2 nixpkgs-13dfd7464e8d88b1d058b00a99cdb473efdd667b.tar.lz nixpkgs-13dfd7464e8d88b1d058b00a99cdb473efdd667b.tar.xz nixpkgs-13dfd7464e8d88b1d058b00a99cdb473efdd667b.tar.zst nixpkgs-13dfd7464e8d88b1d058b00a99cdb473efdd667b.zip | |
freerdp: build tweaks
* use latest ffmpeg_4 * add libjpeg_turbo support * add cairo support * add ffmpeg vaapi support
Diffstat (limited to 'pkgs/applications/networking/remote/freerdp/default.nix')
| -rw-r--r-- | pkgs/applications/networking/remote/freerdp/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 52f8decf170..a81356da252 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg_3, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland -, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt -, libusb1, libpulseaudio ? null, cups ? null, pcsclite ? null, systemd ? null -, buildServer ? true, nocaps ? false }: +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo +, libusb1, libpulseaudio, cups, pcsclite, systemd, libjpeg_turbo +, buildServer ? true, nocaps ? false +}: let cmFlag = flag: if flag then "ON" else "OFF"; @@ -49,8 +50,9 @@ in stdenv.mkDerivation rec { buildInputs = with lib; [ alsaLib + cairo cups - ffmpeg_3 + ffmpeg glib gst-plugins-base gst-plugins-good @@ -65,6 +67,7 @@ in stdenv.mkDerivation rec { libXrender libXtst libXv + libjpeg_turbo libpulseaudio libunwind libusb1 @@ -93,6 +96,9 @@ in stdenv.mkDerivation rec { WITH_PULSE = (libpulseaudio != null); WITH_SERVER = buildServer; WITH_SSE2 = stdenv.isx86_64; + WITH_VAAPI = true; + WITH_JPEG = (libjpeg_turbo != null); + WITH_CAIRO = (cairo != null); }; meta = with lib; { |