Merge #56516: lndir: get rid of xorgproto dependency

... into staging.
This commit is contained in:
Vladimír Čunát 2019-03-01 19:09:54 +01:00
commit dfa45dfb86
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -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--;' ""
'';
});