From ac2ed3818c3ba3bbbc098b8a87cb9c620df8ad01 Mon Sep 17 00:00:00 2001 From: codyopel Date: Tue, 24 Feb 2015 02:32:49 -0500 Subject: libinput: refactor & add optional dependencies --- pkgs/development/libraries/libinput/default.nix | 41 ++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 36 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 52b88244fd9a..c604cd7a35fd 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,5 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, mtdev, udev, libevdev }: +{ stdenv, fetchurl, pkgconfig +, libevdev, mtdev, udev +, documentationSupport ? true, doxygen ? null, graphviz ? null # Documentation +, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support +, testsSupport ? false, check ? null, valgrind ? null +}: +assert documentationSupport -> doxygen != null && graphviz != null; +assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; +assert testsSupport -> check != null && valgrind != null; + +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-0.10.0"; @@ -8,13 +22,24 @@ stdenv.mkDerivation rec { sha256 = "0h8lbhhxb5020bhdblxp1pkapy4bchjj3l44fxabz9pi1zw03q2c"; }; - buildInputs = [ pkgconfig mtdev udev libevdev ]; + configureFlags = [ + (mkFlag documentationSupport "documentation") + (mkFlag eventGUISupport "event-gui") + (mkFlag testsSupport "tests") + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libevdev mtdev udev ] + ++ optionals eventGUISupport [ cairo glib gtk3 ] + ++ optionals documentationSupport [ doxygen graphviz ] + ++ optionals testsSupport [ check valgrind ]; - meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/libinput; - description = "handles input devices in Wayland compositors and to provide a generic X.Org input driver"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ wkennington ]; + meta = { + description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; + homepage = http://www.freedesktop.org/wiki/Software/libinput; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ codyopel wkennington ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0bdc43d78e6..3e598be938bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6352,7 +6352,9 @@ let inherit (gnome) gtkdoc; }; - libinput = callPackage ../development/libraries/libinput { }; + libinput = callPackage ../development/libraries/libinput { + graphviz = graphviz-nox; + }; libiptcdata = callPackage ../development/libraries/libiptcdata { }; -- cgit 1.4.1