Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'

2 files changed, 14 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/development/libraries/wayland/1.9.nix b/nixpkgs/pkgs/development/libraries/wayland/1.9.nix
index 750a786c3fca..3fda417d8e1f 100644
--- a/nixpkgs/pkgs/development/libraries/wayland/1.9.nix
+++ b/nixpkgs/pkgs/development/libraries/wayland/1.9.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage    = https://wayland.freedesktop.org/;
     license     = lib.licenses.mit;
     platforms   = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ codyopel wkennington ];
+    maintainers = with lib.maintainers; [ codyopel ];
   };
 
   passthru.version = version;
diff --git a/nixpkgs/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix
index 866b1232aef5..25cbde63129b 100644
--- a/nixpkgs/pkgs/development/libraries/wayland/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wayland/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig
-, libffi, libxml2
+, libffi, libxml2, wayland
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
 
@@ -15,9 +15,18 @@ stdenv.mkDerivation rec {
     sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf";
   };
 
-  configureFlags = [ "--with-scanner" "--disable-documentation" ];
+  configureFlags = [
+    "--disable-documentation"
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "--with-host-scanner"
+  ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkgconfig
+  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    # for wayland-scanner during build
+    wayland
+  ];
 
   buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
 
@@ -26,7 +35,7 @@ stdenv.mkDerivation rec {
     homepage    = https://wayland.freedesktop.org/;
     license     = lib.licenses.mit;
     platforms   = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ codyopel wkennington ];
+    maintainers = with lib.maintainers; [ codyopel ];
   };
 
   passthru.version = version;