diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 03:47:50 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 03:47:50 +0300 |
commit | d75596995e4afc44df3d348ca08bd9b98b66a48f (patch) | |
tree | f5d8d6a9baec9a5f66ecc2a48aa3885b3607d848 | |
parent | aef35c52f0ddc99d326239b51ca1a2ea03450316 (diff) | |
download | nixpkgs-d75596995e4afc44df3d348ca08bd9b98b66a48f.tar nixpkgs-d75596995e4afc44df3d348ca08bd9b98b66a48f.tar.gz nixpkgs-d75596995e4afc44df3d348ca08bd9b98b66a48f.tar.bz2 nixpkgs-d75596995e4afc44df3d348ca08bd9b98b66a48f.tar.lz nixpkgs-d75596995e4afc44df3d348ca08bd9b98b66a48f.tar.xz nixpkgs-d75596995e4afc44df3d348ca08bd9b98b66a48f.tar.zst nixpkgs-d75596995e4afc44df3d348ca08bd9b98b66a48f.zip |
swt: Fix LFLAGS
Passing '-I${foo}/lib' to GCC doesn't seem sane.
-rw-r--r-- | pkgs/development/libraries/java/swt/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 5ea6fa644cd..454190ebdfb 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk, pkgconfig, gtk +{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk , libXtst, libXi, mesa, webkit, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -37,10 +37,8 @@ in stdenv.mkDerivation rec { buildInputs = [ unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup ]; - NIX_LFLAGS = [ "-lX11" "-I${xorg.libX11}/lib" - "-lpango-1.0" "-I${pango}/lib" - "-lgdk_pixbuf-2.0" "-I${gdk_pixbuf}/lib" - "-lglib-2.0" "-I${glib}/lib"]; + NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ + [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; buildPhase = '' unzip src.zip -d src |