diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-03-01 19:09:54 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-03-01 19:09:54 +0100 |
| commit | dfa45dfb8624f4c8141a836855abd8b712d2ebc2 (patch) | |
| tree | 56d441793602deffd6a5c69148d2e20b26c7c1af /pkgs/servers/x11 | |
| parent | e30d887597f3d4ed227703c3ad3782cba5c8e149 (diff) | |
| parent | 466f1d85d21f79237123d74598a3d7f073513685 (diff) | |
| download | nixlib-dfa45dfb8624f4c8141a836855abd8b712d2ebc2.tar nixlib-dfa45dfb8624f4c8141a836855abd8b712d2ebc2.tar.gz nixlib-dfa45dfb8624f4c8141a836855abd8b712d2ebc2.tar.bz2 nixlib-dfa45dfb8624f4c8141a836855abd8b712d2ebc2.tar.lz nixlib-dfa45dfb8624f4c8141a836855abd8b712d2ebc2.tar.xz nixlib-dfa45dfb8624f4c8141a836855abd8b712d2ebc2.tar.zst nixlib-dfa45dfb8624f4c8141a836855abd8b712d2ebc2.zip | |
Merge #56516: lndir: get rid of xorgproto dependency
... into staging.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c368fa8ea6ef..d62d61b429ec 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -598,8 +598,16 @@ self: super: })); lndir = super.lndir.overrideAttrs (attrs: { + buildInputs = []; preConfigure = '' + export XPROTO_CFLAGS=" " + export XPROTO_LIBS=" " substituteInPlace lndir.c \ + --replace '<X11/Xos.h>' '<string.h>' \ + --replace '<X11/Xfuncproto.h>' '<unistd.h>' \ + --replace '_X_ATTRIBUTE_PRINTF(1,2)' '__attribute__((__format__(__printf__,1,2)))' \ + --replace '_X_ATTRIBUTE_PRINTF(2,3)' '__attribute__((__format__(__printf__,2,3)))' \ + --replace '_X_NORETURN' '__attribute__((noreturn))' \ --replace 'n_dirs--;' "" ''; }); |