Revert "libinput: 1.7.3 -> 1.8.3"

This reverts commit 12f460e. It doesn't build. Discuss at #29784.
NixOS · Oct 16, 2017 · 88b853e · 88b853e
1 parent e55b99e
commit 88b853e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 22 deletions.
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
@@ -1,40 +1,49 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, libevdev, mtdev, udev, libwacom
+{ stdenv, fetchurl, pkgconfig
+, libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
-, testsSupport ? false, check ? null, valgrind ? null }:
+, testsSupport ? false, check ? null, valgrind ? null
+, autoconf, automake
+}:
 
 assert documentationSupport -> doxygen != null && graphviz != null;
 assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
 assert testsSupport -> check != null && valgrind != null;
 
-let mkFlag = c: flag: if c then "-D${flag}=true" else "-D${flag}=false";
-in with stdenv.lib; stdenv.mkDerivation rec {
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.8.3";
+  version = "1.7.3";
 
   src = fetchurl {
-    url = "https://freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0b8l2dmzzm20xf2hw1dr9gnzd3fah9jz5f216p2ajw895zsy5qig";
+    url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
+    sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89";
   };
 
   outputs = [ "out" "dev" ];
 
-  mesonFlags = [
+  configureFlags = [
     (mkFlag documentationSupport "documentation")
-    (mkFlag eventGUISupport "debug-gui")
+    (mkFlag eventGUISupport "event-gui")
     (mkFlag testsSupport "tests")
   ];
 
-  patches = [ ./udev-absolute-path.patch ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
-  buildInputs = [ libevdev mtdev libwacom ]
+  buildInputs = [ libevdev mtdev libwacom autoconf automake ]
     ++ optionals eventGUISupport [ cairo glib gtk3 ]
     ++ optionals documentationSupport [ doxygen graphviz ]
     ++ optionals testsSupport [ check valgrind ];
 
   propagatedBuildInputs = [ udev ];
 
+  patches = [ ./udev-absolute-path.patch ];
+  patchFlags = [ "-p0" ];
+
   meta = {
     description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
     homepage    = http://www.freedesktop.org/wiki/Software/libinput;

diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch
@@ -1,11 +1,12 @@
---- a/meson.build	2017-09-25 11:37:07.787726521 +0000
-+++ b/meson.build	2017-09-25 11:38:48.958233247 +0000
-@@ -100,7 +100,7 @@
-      args : model_quirks)
+--- configure.ac	2016-05-27 14:00:25.248388226 +0200
++++ configure.ac	2016-05-27 14:01:28.228943416 +0200
+@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil
+ # Used by the udev rules so we can use callouts during testing without
+ # installing everything first. Default is the empty string so the installed
+ # rule will use udev's default path. Override is in udev/Makefile.am
+-AC_SUBST(UDEV_TEST_PATH, "")
++UDEV_TEST_PATH="${UDEV_DIR}/"
++AC_SUBST(UDEV_TEST_PATH)
+ AC_PATH_PROG(SED, [sed])
 
- udev_rules_config = configuration_data()
--udev_rules_config.set('UDEV_TEST_PATH', '')
-+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
- configure_file(input : 'udev/80-libinput-device-groups.rules.in',
- 	       output : '80-libinput-device-groups.rules',
- 	       install : true,
+ AC_CONFIG_FILES([Makefile