aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/java
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2019-11-10 16:44:34 +0000
committeradisbladis <adisbladis@gmail.com>2019-11-18 20:10:43 +0000
commitc9d8624ccddf17aee28745446b6763aabb26b4c7 (patch)
treee7caf27ce92b6bc9b94eb65246cb6c2913adca44 /pkgs/development/libraries/java
parente6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff)
treewide: Get rid of libGLU_combined
Diffstat (limited to 'pkgs/development/libraries/java')
-rw-r--r--pkgs/development/libraries/java/swt/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index a93d77742915..6eb5a1f53553 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2
-, libXt, libXtst, libXi, libGLU_combined, webkitgtk, libsoup, xorg
+, libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg
, pango, gdk-pixbuf, glib
}:
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
sourceRoot = ".";
nativeBuildInputs = [ unzip pkgconfig ];
- buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkitgtk libsoup ];
+ buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ];
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" ];