JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

w3m-nox: fix build

Browse Source 
In the latest version (0.5.3+git20190105), `<X11/xlib.h>` isn't directly
included in `fb_imlib2.c` anymore, however it's used by `<Imlib.h>`
which broke our patch which disables X11 here.

Hydra build failure: https://hydra.nixos.org/build/93730733
See also 2266d1bd98
This commit is contained in:
Maximilian Bosch 2019-05-25 11:48:03 +02:00
parent 35961a169d
commit 3cad8fba29
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/browsers/w3m/no-x11.patch
View File

@ -1,14 +1,13 @@
Forget about X11 in fb module. Forget about X11 in fb module.
This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb. This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb.
diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
index ea36637..d3d7bc3 100644 index 1a5151c..d3d7bc3 100644
--- a/w3mimg/fb/fb_imlib2.c --- a/w3mimg/fb/fb_imlib2.c
+++ b/w3mimg/fb/fb_imlib2.c +++ b/w3mimg/fb/fb_imlib2.c
@@ -3,7 +3,7 @@ @@ -3,6 +3,7 @@
fb_imlib2.c 0.3 Copyright (C) 2002, hito fb_imlib2.c 0.3 Copyright (C) 2002, hito
**************************************************************************/ **************************************************************************/
-#include <X11/Xlib.h>
+#define X_DISPLAY_MISSING +#define X_DISPLAY_MISSING
#include <Imlib2.h> #include <Imlib2.h>
#include "fb.h" #include "fb.h"