diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-04-13 02:12:35 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-04-13 02:13:07 +0300 |
| commit | b5258982d27350322c0d37e44dfb84fb18c9f73d (patch) | |
| tree | c94a8a3fbed6fc1bc710d126e1e47731ea3cea27 /pkgs/development/libraries/qt-4.x | |
| parent | 75f1a55fbe8a98b497828fd77f6c117d587a62da (diff) | |
qt4: enable gtk2 by default
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
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 46bb7a4e8faa5..18f2e7611a9ed 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; |