diff options
author | William A. Kennington III <william@wkennington.com> | 2015-02-19 09:57:13 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-02-19 09:57:16 -0800 |
commit | e574da83de877de5818ab75129ba840147c50d77 (patch) | |
tree | 2cab3b8a024a2571a88bfd5ae62b6b821114b127 /pkgs/development/libraries/wayland/default.nix | |
parent | 2cbd639b2aa075cfc5caadbd4dd29612ebdc006b (diff) | |
download | nixpkgs-e574da83de877de5818ab75129ba840147c50d77.tar nixpkgs-e574da83de877de5818ab75129ba840147c50d77.tar.gz nixpkgs-e574da83de877de5818ab75129ba840147c50d77.tar.bz2 nixpkgs-e574da83de877de5818ab75129ba840147c50d77.tar.lz nixpkgs-e574da83de877de5818ab75129ba840147c50d77.tar.xz nixpkgs-e574da83de877de5818ab75129ba840147c50d77.tar.zst nixpkgs-e574da83de877de5818ab75129ba840147c50d77.zip |
wayland: Always build documentation
Diffstat (limited to 'pkgs/development/libraries/wayland/default.nix')
-rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index e3cabcc8abf..cdd663bf191 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -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; } |