public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47119 from dtzWill/update/libinput-1.12.0

Browse Source 
libinput: 1.11.3 -> 1.12.0
This commit is contained in:
Will Dietz 2018-09-23 13:21:43 -05:00 committed by GitHub
commit 33ae1a1a78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libinput/default.nix
View File

@ -16,11 +16,11 @@ in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libinput-${version}"; name = "libinput-${version}";
version = "1.11.3"; version = "1.12.0";
src = fetchurl { src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk"; sha256 = "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m";
}; };
outputs = [ "bin" "out" "dev" ]; outputs = [ "bin" "out" "dev" ];
@ -46,12 +46,6 @@ stdenv.mkDerivation rec {
patches = [ ./udev-absolute-path.patch ]; patches = [ ./udev-absolute-path.patch ];
preBuild = ''
# meson setup-hook changes the directory so the files are located one level up
patchShebangs ../udev/parse_hwdb.py
patchShebangs ../test/symbols-leak-test.in
'';
doCheck = testsSupport; doCheck = testsSupport;
meta = { meta = {

2
pkgs/development/libraries/libinput/udev-absolute-path.patch
View File

@ -5,7 +5,7 @@
udev_rules_config = configuration_data() udev_rules_config = configuration_data()
-udev_rules_config.set('UDEV_TEST_PATH', '') -udev_rules_config.set('UDEV_TEST_PATH', '')
+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') +udev_rules_config.set('UDEV_TEST_PATH', dir_udev + '/')
configure_file(input : 'udev/80-libinput-device-groups.rules.in', configure_file(input : 'udev/80-libinput-device-groups.rules.in',
output : '80-libinput-device-groups.rules', output : '80-libinput-device-groups.rules',
install : true, install : true,