pyrox.dev
lol
swt: Fix LFLAGS
Passing '-I${foo}/lib' to GCC doesn't seem sane.
+3
-5
+3
-5
pkgs/development/libraries/java/swt/default.nix
+3
-5
pkgs/development/libraries/java/swt/default.nix
···
1
-
{ stdenv, fetchurl, unzip, jdk, pkgconfig, gtk
1
+
{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk
2
2
, libXtst, libXi, mesa, webkit, libsoup, xorg
3
3
, pango, gdk_pixbuf, glib
4
4
}:
···
37
37
38
38
buildInputs = [ unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup ];
39
39
40
-
NIX_LFLAGS = [ "-lX11" "-I${xorg.libX11}/lib"
41
-
"-lpango-1.0" "-I${pango}/lib"
42
-
"-lgdk_pixbuf-2.0" "-I${gdk_pixbuf}/lib"
43
-
"-lglib-2.0" "-I${glib}/lib"];
40
+
NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++
41
+
[ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];
44
42
45
43
buildPhase = ''
46
44
unzip src.zip -d src