geis: refactor & fix build

- Pass -Wno-error=pedantic to work around ISO C violations
- Build with X11 unconditionally (also rely on pkgconfig for
  detection, --enable-x11 does not work)
- Build against evemu

2 files changed, 26 insertions, 10 deletions

diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 5ef53ec7939..e8f4001c1b5 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -1,23 +1,37 @@
-{ enableX11 ? true
-, stdenv, fetchurl, pkgconfig, xorg, xorgserver, python3, dbus_libs, frame, grail }:
+{ stdenv, fetchurl
+, pkgconfig
+, python3
+, dbus_libs
+, evemu
+, frame
+, grail
+, libX11
+, libXext
+, libXi
+, libXtst
+, xorgserver
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "geis-${version}";
   version = "2.2.16";
+
   src = fetchurl {
     url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz";
     sha256 = "40a694092c79f325a2fbf8a9f301177bc91c364f4e637c2aa8963ad2a5aabbcf";
   };
 
-  buildInputs = [ pkgconfig python3 dbus_libs frame grail ]
-  ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.xorgserver];
+  NIX_CFLAGS_COMPILE = "-Wno-error=pedantic";
 
-  configureFlags = stdenv.lib.optional enableX11"--enable-x11";
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python3 dbus_libs evemu frame grail libX11 libXext libXi libXtst xorgserver ];
 
   meta = {
-    homepage = "https://launchpad.net/geis";
-    description = "A library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    description = "A library for input gesture recognition";
+    homepage = https://launchpad.net/geis;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d33a3e09e3..a39ae1a7502 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6290,7 +6290,9 @@ in
 
   m4 = gnum4;
 
-  geis = callPackage ../development/libraries/geis { };
+  geis = callPackage ../development/libraries/geis {
+    inherit (xorg) libX11 libXext libXi libXtst;
+  };
 
   global = callPackage ../development/tools/misc/global { };