Commit c0bbacf1 authored by Adam Joseph's avatar Adam Joseph
Browse files

freerdp: add wayland-scanner to nativeBuildInputs 

We must also pass `-DWAYLAND_SCANNER=` explicitly, because freerdp
attempts to use the `hostPlatform`'s wayland-scanner (which it
presumably is locating via the `wayland` in `buildInputs`)
parent 7cb92d08

pkgs/applications/networking/remote/freerdp/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
, libxkbcommon

, libxkbfile

, wayland

, wayland-scanner

, gstreamer

, gst-plugins-base

, gst-plugins-good
@@ -48,6 +49,8 @@ 
, Cocoa

, CoreMedia

, withUnfree ? false



, buildPackages

}:



let
@@ -149,7 +152,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 +164,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