MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 08:36:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

swt: Fix LFLAGS

Browse source 
Passing '-I${foo}/lib' to GCC doesn't seem sane.
This commit is contained in:
Tuomas Tynkkynen 2016-08-30 03:47:50 +03:00
parent aef35c52f0
commit d75596995e
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/java/swt/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, jdk, pkgconfig, gtk { stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk
, libXtst, libXi, mesa, webkit, libsoup, xorg , libXtst, libXi, mesa, webkit, libsoup, xorg
, pango, gdk_pixbuf, glib , pango, gdk_pixbuf, glib
}: }:
@ -37,10 +37,8 @@ in stdenv.mkDerivation rec {
buildInputs = [ unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup ]; buildInputs = [ unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup ];
NIX_LFLAGS = [ "-lX11" "-I${xorg.libX11}/lib" NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++
"-lpango-1.0" "-I${pango}/lib" [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];
"-lgdk_pixbuf-2.0" "-I${gdk_pixbuf}/lib"
"-lglib-2.0" "-I${glib}/lib"];
buildPhase = '' buildPhase = ''
unzip src.zip -d src unzip src.zip -d src