mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-15 16:46:21 +00:00
Code Issues Wiki Activity

freerdp: build tweaks

Browse source 
* use latest ffmpeg_4
* add libjpeg_turbo support
* add cairo support
* add ffmpeg vaapi support
This commit is contained in:
WORLDofPEACE 2020-09-26 12:53:19 -04:00 committed by Jan Tojnar
parent af2465acb9
commit 13dfd7464e
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/networking/remote/freerdp/default.nix
View file

@ -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; {

1
pkgs/top-level/all-packages.nix
View file

@ -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;
};