Skip to content

Commit

Permalink
Merge pull request #225342 from amjoseph-nixpkgs/pr/fixcross/freerdp
Browse files Browse the repository at this point in the history
freerdp: fix cross
  • Loading branch information
lheckemann committed Apr 10, 2023
2 parents 7ceda50 + c1f1838 commit 1243de2
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion pkgs/applications/networking/remote/freerdp/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
, libxkbcommon
, libxkbfile
, wayland
, wayland-scanner
, gstreamer
, gst-plugins-base
, gst-plugins-good
Expand All @@ -48,6 +49,11 @@
, Cocoa
, CoreMedia
, withUnfree ? false

# tries to compile and run generate_argument_docbook.c
, withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform

, buildPackages
}:

let
Expand Down Expand Up @@ -149,7 +155,10 @@ stdenv.mkDerivation rec {
faac
];

nativeBuildInputs = [ cmake libxslt docbook-xsl-nons pkg-config ];
nativeBuildInputs = [
cmake libxslt docbook-xsl-nons pkg-config
wayland-scanner
];

doCheck = true;

Expand All @@ -158,6 +167,7 @@ stdenv.mkDerivation rec {
"-Wno-dev"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
"-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"
]
++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
BUILD_TESTING = false; # false is recommended by upstream
Expand All @@ -168,6 +178,7 @@ stdenv.mkDerivation rec {
WITH_JPEG = (libjpeg_turbo != null);
WITH_OPENH264 = (openh264 != null);
WITH_OSS = false;
WITH_MANPAGES = withManPages;
WITH_PCSC = (pcsclite != null);
WITH_PULSE = (libpulseaudio != null);
WITH_SERVER = buildServer;
Expand Down

0 comments on commit 1243de2

Please sign in to comment.