diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-11-26 07:12:45 +0000 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-11-28 01:06:42 +0000 |
commit | fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6 (patch) | |
tree | e5e95e83562904c90741f4fedd89a19c2b7df830 /pkgs/development/libraries/wayland/default.nix | |
parent | f17ff7d6efa1727bb6fa1c33d9f7af3229d94083 (diff) | |
download | nixpkgs-fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6.tar nixpkgs-fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6.tar.gz nixpkgs-fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6.tar.bz2 nixpkgs-fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6.tar.lz nixpkgs-fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6.tar.xz nixpkgs-fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6.tar.zst nixpkgs-fbb114107d7fae6c0488cc7cc30d4786fc1dd9c6.zip |
wayland: fix cross-build
Diffstat (limited to 'pkgs/development/libraries/wayland/default.nix')
-rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 866b1232aef..c694cc7b445 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/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" ]; - - nativeBuildInputs = [ pkgconfig ]; + configureFlags = [ + "--disable-documentation" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-host-scanner" + ]; + + nativeBuildInputs = [ + pkgconfig + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # for wayland-scanner during build + wayland + ]; buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; |