diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 46bb7a4e8faa..18f2e7611a9e 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -6,7 +6,8 @@ , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) , flashplayerFix ? false, gdk_pixbuf -, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs +, gtkStyle ? true, gtk2 +, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs , developerBuild ? false , docs ? false , examples ? false @@ -73,14 +74,15 @@ stdenv.mkDerivation rec { glibc = stdenv.cc.libc.out; openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; }) - ] ++ stdenv.lib.optional gtkStyle (substituteAll { + ] ++ stdenv.lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter - gconf = GConf.out; gtk = gtk2.out; + } // stdenv.lib.optionalAttrs gnomeStyle { + gconf = GConf.out; libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; - }) + })) ++ stdenv.lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; gtk = gtk2.out;