diff options
-rw-r--r-- | pkgs/applications/networking/remote/freerdp/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 11 insertions, 6 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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70db6da4bc3..5b3f00c96be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20902,7 +20902,6 @@ in xrdp = callPackage ../applications/networking/remote/xrdp { }; freerdp = callPackage ../applications/networking/remote/freerdp { - inherit libpulseaudio; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; |