From eb5c1616401ff78509ee707a060efe738f5378b1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 May 2015 18:16:07 +0200 Subject: [PATCH] wayland: Fewer build-time dependencies --- pkgs/development/libraries/wayland/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index cdd663bf191..e5a01c5d843 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,16 +1,12 @@ { stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto -, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) +, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, expat }: # Require the optional to be enabled until upstream fixes or removes the configure flag assert expat != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with stdenv.lib; + stdenv.mkDerivation rec { name = "wayland-${version}"; version = "1.7.0"; @@ -20,13 +16,11 @@ stdenv.mkDerivation rec { sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx"; }; - configureFlags = [ - (mkFlag (expat != null) "scanner") - ]; + configureFlags = "--with-scanner --disable-documentation"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libffi docbook_xsl doxygen graphviz libxslt xmlto expat ]; + buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat ]; meta = { description = "Reference implementation of the wayland protocol";