Merge pull request #118276 from alyssais/wayland

wayland: fix build on non-Linux
This commit is contained in:
Michael Weiss 2021-04-02 20:29:20 +02:00 committed by GitHub
commit 80da42cc1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,7 +10,8 @@
, libxml2
, wayland
, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
, withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform
, withLibraries ? stdenv.isLinux
, withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform
, graphviz-nox
, doxygen
, libxslt
@ -21,6 +22,9 @@
, docbook_xml_dtd_42
}:
# Documentation is only built when building libraries.
assert withDocumentation -> withLibraries;
# Require the optional to be enabled until upstream fixes or removes the configure flag
assert expat != null;
let
@ -45,7 +49,10 @@ stdenv.mkDerivation rec {
outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ];
separateDebugInfo = true;
mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ];
mesonFlags = [
"-Dlibraries=${lib.boolToString withLibraries}"
"-Ddocumentation=${lib.boolToString withDocumentation}"
];
postPatch = lib.optionalString withDocumentation ''
patchShebangs doc/doxygen/gen-doxygen.py
@ -71,16 +78,17 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libffi
expat
libxml2
] ++ lib.optionals withLibraries [
libffi
] ++ lib.optionals withDocumentation [
docbook_xsl
docbook_xml_dtd_45
docbook_xml_dtd_42
];
meta = {
meta = with lib; {
description = "Core Wayland window system code and protocol";
longDescription = ''
Wayland is a project to define a protocol for a compositor to talk to its
@ -91,9 +99,9 @@ stdenv.mkDerivation rec {
rendering).
'';
homepage = "https://wayland.freedesktop.org/";
license = lib.licenses.mit; # Expat version
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ primeos codyopel ];
license = licenses.mit; # Expat version
platforms = if withLibraries then platforms.linux else platforms.unix;
maintainers = with maintainers; [ primeos codyopel qyliss ];
};
passthru.version = version;