aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/qt-3
diff options
context:
space:
mode:
authorAlexander V. Nikolaev <avn@avnik.info>2018-02-24 15:12:44 +0200
committerAlexander V. Nikolaev <avn@avnik.info>2018-02-24 17:06:49 +0200
commit0acec7e984ff38b7a296a459ba4b539a3b719c1b (patch)
tree1d60ce67493ab87f80acb127f4e26a11a0324c28 /pkgs/development/libraries/qt-3
parent1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff)
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/development/libraries/qt-3')
-rw-r--r--pkgs/development/libraries/qt-3/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 1bc4fd1085e1..174be6a8f53a 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -6,7 +6,7 @@
, cursorSupport ? true, libXcursor ? null
, threadSupport ? true
, mysqlSupport ? false, mysql ? null
-, openglSupport ? false, mesa ? null, libXmu ? null
+, openglSupport ? false, libGLU_combined ? null, libXmu ? null
, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which
}:
@@ -15,7 +15,7 @@ assert xrenderSupport -> xftSupport && libXrender != null;
assert xrandrSupport -> libXrandr != null && randrproto != null;
assert cursorSupport -> libXcursor != null;
assert mysqlSupport -> mysql != null;
-assert openglSupport -> mesa != null && libXmu != null;
+assert openglSupport -> libGLU_combined != null && libXmu != null;
stdenv.mkDerivation {
name = "qt-3.3.8";
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
-qt-gif
-I${xextproto}/include
${if openglSupport then "-dlopen-opengl
- -L${mesa}/lib -I${mesa}/include
+ -L${libGLU_combined}/lib -I${mesa}/include
-L${libXmu.out}/lib -I${libXmu.dev}/include" else ""}
${if threadSupport then "-thread" else "-no-thread"}
${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"}