diff options
| author | Will Dietz <w@wdtz.org> | 2018-09-21 07:37:38 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-09-21 10:35:11 -0500 |
| commit | a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e (patch) | |
| tree | 8a54d1c4db30f510c9ca497c10ba2365c436d9f0 /pkgs/development/libraries/libinput | |
| parent | 45dc194f723622f987f2f1ad6e9eb7f4e677b91e (diff) | |
| download | nixpkgs-a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e.tar nixpkgs-a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e.tar.gz nixpkgs-a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e.tar.bz2 nixpkgs-a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e.tar.lz nixpkgs-a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e.tar.xz nixpkgs-a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e.tar.zst nixpkgs-a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e.zip | |
libinput: fix build w/1.12.0
Diffstat (limited to 'pkgs/development/libraries/libinput')
| -rw-r--r-- | pkgs/development/libraries/libinput/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libinput/udev-absolute-path.patch | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 925b278f5b7..4c85971cc3c 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -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 fb22fea40e8..5c85b863948 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, |