From e574da83de877de5818ab75129ba840147c50d77 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 19 Feb 2015 09:57:13 -0800
Subject: wayland: Always build documentation

---
 pkgs/development/libraries/wayland/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'pkgs/development/libraries/wayland/default.nix')

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;
 }
-- 
cgit 1.4.1