about summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorJorge Acereda <jacereda@gmail.com>2019-03-01 00:09:37 +0100
committerJorge Acereda <jacereda@gmail.com>2019-03-01 00:09:37 +0100
commit466f1d85d21f79237123d74598a3d7f073513685 (patch)
tree60796f49598eb1cf9e9a183d3ccd3c16863c979b /pkgs/servers/x11
parente416d2f8b9ac47ee5c35f5029f7eeca91dbadf35 (diff)
downloadnixlib-466f1d85d21f79237123d74598a3d7f073513685.tar
nixlib-466f1d85d21f79237123d74598a3d7f073513685.tar.gz
nixlib-466f1d85d21f79237123d74598a3d7f073513685.tar.bz2
nixlib-466f1d85d21f79237123d74598a3d7f073513685.tar.lz
nixlib-466f1d85d21f79237123d74598a3d7f073513685.tar.xz
nixlib-466f1d85d21f79237123d74598a3d7f073513685.tar.zst
nixlib-466f1d85d21f79237123d74598a3d7f073513685.zip
lndir: get rid of xorgproto dependency
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix8
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--;' ""
     '';
   });