diff options
| author | Will Dietz <github@wdtz.org> | 2018-09-23 13:21:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 13:21:43 -0500 |
| commit | 33ae1a1a783e3723e5a6d55f95ac85a809cc969b (patch) | |
| tree | 40ee1bd3cfb42aca0c0a86e334ddd6c7a85759e8 /pkgs/development/libraries | |
| parent | 0ae8ac86510aae6491f49964f0b8af99dc2869e9 (diff) | |
| parent | a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e (diff) | |
| download | nixlib-33ae1a1a783e3723e5a6d55f95ac85a809cc969b.tar nixlib-33ae1a1a783e3723e5a6d55f95ac85a809cc969b.tar.gz nixlib-33ae1a1a783e3723e5a6d55f95ac85a809cc969b.tar.bz2 nixlib-33ae1a1a783e3723e5a6d55f95ac85a809cc969b.tar.lz nixlib-33ae1a1a783e3723e5a6d55f95ac85a809cc969b.tar.xz nixlib-33ae1a1a783e3723e5a6d55f95ac85a809cc969b.tar.zst nixlib-33ae1a1a783e3723e5a6d55f95ac85a809cc969b.zip | |
Merge pull request #47119 from dtzWill/update/libinput-1.12.0
libinput: 1.11.3 -> 1.12.0
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libinput/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libinput/udev-absolute-path.patch | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index d42bd315d22f..4c85971cc3ce 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.11.3"; + version = "1.12.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk"; + sha256 = "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m"; }; outputs = [ "bin" "out" "dev" ]; @@ -46,12 +46,6 @@ stdenv.mkDerivation rec { 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; meta = { diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index fb22fea40e80..5c85b8639486 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -5,7 +5,7 @@ udev_rules_config = configuration_data() -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', output : '80-libinput-device-groups.rules', install : true, |