MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wayland: Always build documentation

Browse source
This commit is contained in:
William A. Kennington III 2015-02-19 09:57:13 -08:00
parent 2cbd639b2a
commit e574da83de
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/libraries/wayland/default.nix
View file

@ -1,14 +1,10 @@
{ stdenv, fetchurl, pkgconfig
, libffi
, scannerSupport ? true, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
, documentationSupport ? false, docbook_xsl ? null, doxygen ? null, graphviz-nox ? null, libxslt ? null, xmlto ? null #, publican ? null
, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto
, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
}:
# Require the optional to be enabled until upstream fixes or removes the configure flag
assert scannerSupport;
assert scannerSupport -> (expat != null);
assert documentationSupport -> ((docbook_xsl != null) && (doxygen != null) && (graphviz-nox != null) && (libxslt != null) && (xmlto != null));
assert expat != null;
let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
@ -25,15 +21,12 @@ stdenv.mkDerivation rec {
};
configureFlags = [
(mkFlag scannerSupport "scanner")
(mkFlag documentationSupport "documentation")
(mkFlag (expat != null) "scanner")
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libffi ]
++ optional scannerSupport expat
++ optionals documentationSupport [ docbook_xsl doxygen graphviz-nox libxslt xmlto ];
buildInputs = [ libffi docbook_xsl doxygen graphviz libxslt xmlto expat ];
meta = {
description = "Reference implementation of the wayland protocol";
@ -42,4 +35,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ codyopel wkennington ];
};
passthru.version = version;
}

4
pkgs/top-level/all-packages.nix
View file

@ -7432,7 +7432,9 @@ let
wavpack = callPackage ../development/libraries/wavpack { };
wayland = callPackage ../development/libraries/wayland { };
wayland = callPackage ../development/libraries/wayland {
graphviz = graphviz-nox;
};
webkit = webkitgtk;