diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-02-14 10:50:08 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-14 13:46:27 +0000 |
| commit | 4bcab74b94c14e608d517dd626a8fbe6c29b9064 (patch) | |
| tree | 4d963c1d6a883582c3c794b06a2b82ef37a48c7f /pkgs/development/libraries/libinput | |
| parent | beb954d9499fa1a317c9ef7159e4785af834a7b7 (diff) | |
| download | nixpkgs-4bcab74b94c14e608d517dd626a8fbe6c29b9064.tar nixpkgs-4bcab74b94c14e608d517dd626a8fbe6c29b9064.tar.gz nixpkgs-4bcab74b94c14e608d517dd626a8fbe6c29b9064.tar.bz2 nixpkgs-4bcab74b94c14e608d517dd626a8fbe6c29b9064.tar.lz nixpkgs-4bcab74b94c14e608d517dd626a8fbe6c29b9064.tar.xz nixpkgs-4bcab74b94c14e608d517dd626a8fbe6c29b9064.tar.zst nixpkgs-4bcab74b94c14e608d517dd626a8fbe6c29b9064.zip | |
libinput: don't try to create /etc in build
How libinput tries to create /etc changed in upstream commit
05501cd34f9c ("meson: use install_emptydir to create directory"),
so we have to update our sed expression.
This was missed in when libinput was updated in Nixpkgs due to a Nix
bug[1], which made the sandbox's /etc writeable.
[1]: https://github.com/NixOS/nix/issues/7813
Fixes: bf928e55794 ("libinput: 1.21.0 → 1.22.1")
Diffstat (limited to 'pkgs/development/libraries/libinput')
| -rw-r--r-- | pkgs/development/libraries/libinput/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index dfd5ce1a095..268ddd37081 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -113,8 +113,8 @@ stdenv.mkDerivation rec { test/check-leftover-udev-rules.sh \ test/helper-copy-and-exec-from-tmp.sh - # Don't create an empty /etc directory. - sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build + # Don't create an empty directory under /etc. + sed -i "/install_emptydir(dir_etc \/ 'libinput')/d" meson.build ''; passthru = { |