From 466f1d85d21f79237123d74598a3d7f073513685 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Fri, 1 Mar 2019 00:09:37 +0100 Subject: [PATCH] lndir: get rid of xorgproto dependency --- pkgs/servers/x11/xorg/overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) 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 '' '' \ + --replace '' '' \ + --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--;' "" ''; });