mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 12:43:52 +00:00
076a4b662c
Cleaner nested unpacking, as well as general robustness improvements. Turns out the LFLAGS stuff was from upstream not trusting pkg-config on their boxes, but it works great for us. (Or rather, it works great after fixing some of their pkg-config invocations.) Assisted by the diffoscope ( https://diffoscope.org/ ) and readelf grepping based on its output.
9 lines
196 B
Diff
9 lines
196 B
Diff
--- a/make_linux.mak
|
|
+++ b/make_linux.mak
|
|
@@ -63,4 +63,4 @@
|
|
|
|
AWT_LFLAGS = -shared ${SWT_LFLAGS}
|
|
-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
|
|
+AWT_LIBS = `pkg-config --libs x11` -L$(AWT_LIB_PATH) -ljawt
|
|
|