From b080956078b3e7db64bb8f88efe80a1e7576c75c Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:08:52 +0200
Subject: [PATCH 1/2] libinput: 1.2.1 -> 1.2.2
---
pkgs/development/libraries/libinput/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 6d80bfdccf1..d903dfefcca 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libinput-1.2.1";
+ name = "libinput-1.2.2";
src = fetchurl {
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
- sha256 = "1hy1h0a4zx5wj23sah4kms2z0285yl0kcn4fqlrrp1gqax9qrnz2";
+ sha256 = "0rzkp37dnn4qnkx7v3hckx5ryv3lr0vl234pnk6z2vfq40v5pb08";
};
configureFlags = [
From 9722fa06e996fcc043439cafbf1c62ff3d4424d4 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:11:46 +0200
Subject: [PATCH 2/2] libinput: propagate udev dependency
---
pkgs/development/libraries/libinput/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index d903dfefcca..18dbd2de38b 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -30,11 +30,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libevdev mtdev udev libwacom ]
+ buildInputs = [ libevdev mtdev libwacom ]
++ optionals eventGUISupport [ cairo glib gtk3 ]
++ optionals documentationSupport [ doxygen graphviz ]
++ optionals testsSupport [ check valgrind ];
+ propagatedBuildInputs = [ udev ];
+
meta = {
description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
homepage = http://www.freedesktop.org/wiki/Software/libinput;