nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #225342 from amjoseph-nixpkgs/pr/fixcross/freerdp

Browse Source 
freerdp: fix cross
This commit is contained in:
Linus Heckemann 2023-04-10 14:45:48 +02:00 committed by GitHub
commit 1243de2b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@
, libxkbcommon
, libxkbfile
, wayland
, wayland-scanner
, gstreamer
, gst-plugins-base
, gst-plugins-good
@ -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
@ -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;
@ -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
@ -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;